diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eabb808..94146118 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ - 1.0.0-rc4 (2019-09-24) +1.0.0-rc5 (2019-09-25) +======================= + +Bugfixes +-------- + +- Fix bug where teams would start echoing messages after accepting an oauth request. ([\#260](https://github.com/matrix-org/matrix-appservice-slack/issues/260)) +- Fix issue where using RTM on large deployments would trigger Slack to turn off Event subscriptions ([\#261](https://github.com/matrix-org/matrix-appservice-slack/issues/261)) + + +1.0.0-rc4 (2019-09-24) ======================= Bugfixes diff --git a/changelog.d/260.bugfix b/changelog.d/260.bugfix deleted file mode 100644 index bffde0e8..00000000 --- a/changelog.d/260.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix bug where teams would start echoing messages after accepting an oauth request. \ No newline at end of file diff --git a/changelog.d/261.bugfix b/changelog.d/261.bugfix deleted file mode 100644 index a5ae7aa1..00000000 --- a/changelog.d/261.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix issue where using RTM on large deployments would trigger Slack to turn off Event subscriptions \ No newline at end of file diff --git a/package.json b/package.json index b94dd0ba..e1e36e97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "1.0.0-rc4", + "version": "1.0.0-rc5", "description": "A Matrix <--> Slack bridge", "main": "app.js", "scripts": {