diff --git a/CHANGELOG.md b/CHANGELOG.md index 83b805ac..008d90f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ - 2.1.0-rc1 (2020-09-23) + 2.1.0-rc2 (2020-09-25) +======================= + +Bugfixes +-------- + +- Ensure that the bridge bot uses the real homeserver URL when encryption is enabled ([\#233](https://github.com/matrix-org/matrix-appservice-bridge/issues/233)) + + +2.1.0-rc1 (2020-09-23) ======================= Features diff --git a/changelog.d/233.bugfix b/changelog.d/233.bugfix deleted file mode 100644 index e75a0144..00000000 --- a/changelog.d/233.bugfix +++ /dev/null @@ -1 +0,0 @@ -Ensure that the bridge bot uses the real homeserver URL when encryption is enabled diff --git a/package-lock.json b/package-lock.json index 453b0ab5..0a1e5750 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-bridge", - "version": "2.0.0", + "version": "2.1.0-rc2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8d6f7703..4033c0dc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-bridge", - "version": "2.1.0-rc1", + "version": "2.1.0-rc2", "description": "Bridging infrastructure for Matrix Application Services", "main": "lib/index.js", "types": "lib/index.d.ts",