diff --git a/CHANGELOG.md b/CHANGELOG.md index 37c89d04..4fd70293 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,20 @@ - 1.0.0-rc2 (2019-09-18) + 1.0.0-rc3 (2019-09-24) +======================= + +Bugfixes +-------- + +- Ensure users enter the correct type of token into the link command ([\#243](https://github.com/matrix-org/matrix-appservice-slack-issues/243)) +- Fix issue where the bridge will not start if a team cannot connect to RTM. ([\#247](https://github.com/matrix-org/matrix-appservice-slack-issues/247)) + + +Internal Changes +---------------- + +- Log more information during startup ([\#246](https://github.com/matrix-org/matrix-appservice-slack-issues/246)) + + +1.0.0-rc2 (2019-09-18) ======================= Features diff --git a/changelog.d/243.bugfix b/changelog.d/243.bugfix deleted file mode 100644 index e20c073e..00000000 --- a/changelog.d/243.bugfix +++ /dev/null @@ -1 +0,0 @@ -Ensure users enter the correct type of token into the link command diff --git a/changelog.d/246.misc b/changelog.d/246.misc deleted file mode 100644 index a8de9dd6..00000000 --- a/changelog.d/246.misc +++ /dev/null @@ -1 +0,0 @@ -Log more information during startup \ No newline at end of file diff --git a/changelog.d/247.bugfix b/changelog.d/247.bugfix deleted file mode 100644 index 2c940a77..00000000 --- a/changelog.d/247.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix issue where the bridge will not start if a team cannot connect to RTM. \ No newline at end of file diff --git a/package.json b/package.json index 5b67873b..fe867330 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "1.0.0-rc2", + "version": "1.0.0-rc3", "description": "A Matrix <--> Slack bridge", "main": "app.js", "scripts": {