diff --git a/CHANGELOG.md b/CHANGELOG.md index eb0e1207..37c89d04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ + 1.0.0-rc2 (2019-09-18) +======================= + +Features +-------- + +- Suppport puppeted reactions/redactions ([\#235](https://github.com/matrix-org/matrix-appservice-slack-issues/235)) + + +Bugfixes +-------- + +- Remove option slack_user_token on link command ([\#236](https://github.com/matrix-org/matrix-appservice-slack-issues/236)) +- Messages from puppeted accounts are no longer duplicated over the bridge ([\#237](https://github.com/matrix-org/matrix-appservice-slack-issues/237)) +- Do not send messages to slack with no content ([\#238](https://github.com/matrix-org/matrix-appservice-slack-issues/238)) + + 1.0.0-rc1 (2019-09-13) ======================= diff --git a/changelog.d/235.feature b/changelog.d/235.feature deleted file mode 100644 index f8b4538b..00000000 --- a/changelog.d/235.feature +++ /dev/null @@ -1 +0,0 @@ -Suppport puppeted reactions/redactions \ No newline at end of file diff --git a/changelog.d/236.bugfix b/changelog.d/236.bugfix deleted file mode 100644 index 48f121d8..00000000 --- a/changelog.d/236.bugfix +++ /dev/null @@ -1 +0,0 @@ -Remove option slack_user_token on link command \ No newline at end of file diff --git a/changelog.d/237.bugfix b/changelog.d/237.bugfix deleted file mode 100644 index 792faa34..00000000 --- a/changelog.d/237.bugfix +++ /dev/null @@ -1 +0,0 @@ -Messages from puppeted accounts are no longer duplicated over the bridge \ No newline at end of file diff --git a/changelog.d/238.bugfix b/changelog.d/238.bugfix deleted file mode 100644 index 96f21001..00000000 --- a/changelog.d/238.bugfix +++ /dev/null @@ -1 +0,0 @@ -Do not send messages to slack with no content \ No newline at end of file diff --git a/package.json b/package.json index e16202de..6acd9367 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "1.0.0-rc1", + "version": "1.0.0-rc2", "description": "A Matrix <--> Slack bridge", "main": "app.js", "scripts": {