diff --git a/CHANGELOG.md b/CHANGELOG.md index 94146118..4afb31f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + 1.0.0-rc6 (2019-09-27) +======================= + +Bugfixes +-------- + +- Do not handle slack tombstone messages as edits ([\#262](https://github.com/matrix-org/matrix-appservice-slack/issues/262)) +- Fix issue where metrics would not report user activity ages ([\#263](https://github.com/matrix-org/matrix-appservice-slack/issues/263)) + + 1.0.0-rc5 (2019-09-25) ======================= diff --git a/changelog.d/262.bugfix b/changelog.d/262.bugfix deleted file mode 100644 index b1746dc9..00000000 --- a/changelog.d/262.bugfix +++ /dev/null @@ -1 +0,0 @@ -Do not handle slack tombstone messages as edits \ No newline at end of file diff --git a/changelog.d/263.bugfix b/changelog.d/263.bugfix deleted file mode 100644 index 48595cb2..00000000 --- a/changelog.d/263.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix issue where metrics would not report user activity ages \ No newline at end of file diff --git a/package.json b/package.json index e1e36e97..ec88cb48 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "1.0.0-rc5", + "version": "1.0.0-rc6", "description": "A Matrix <--> Slack bridge", "main": "app.js", "scripts": {