diff --git a/CHANGELOG.md b/CHANGELOG.md index 39072e86..dc81b882 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ - 2.3.0-rc1 (2020-10-21) + 2.3.0-rc2 (2020-10-22) +======================= + +Bugfixes +-------- + +- Fix a bug where a timeout would not be cleared after a sucessful homeserver ping test ([\#256](https://github.com/matrix-org/matrix-appservice-bridge/issues/256)) + + +2.3.0-rc1 (2020-10-21) ======================= Features diff --git a/changelog.d/256.feature b/changelog.d/256.feature deleted file mode 100644 index eb15121d..00000000 --- a/changelog.d/256.feature +++ /dev/null @@ -1 +0,0 @@ -Add function to ping the homeserver to check that the AS can be reached \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 23b2480d..76316851 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-bridge", - "version": "2.2.0", + "version": "2.3.0-rc2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4300033d..978bbd5d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-bridge", - "version": "2.3.0-rc1", + "version": "2.3.0-rc2", "description": "Bridging infrastructure for Matrix Application Services", "main": "lib/index.js", "types": "lib/index.d.ts",