diff --git a/CHANGELOG.md b/CHANGELOG.md index ac22c7b57..41a3905ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +2.1.0 (2023-03-03) +================== + +Features +-------- + +- Add a new UI widget for linking and unlinking channels from within a Matrix room. ([\#734](https://github.com/matrix-org/matrix-appservice-slack/issues/734), [\#735](https://github.com/matrix-org/matrix-appservice-slack/issues/735)) + + +Internal Changes +---------------- + +- Correctly attribute mkarg for documentation contributions. We also reverted commits and recommited them with the correct Author value set. ([\#729](https://github.com/matrix-org/matrix-appservice-slack/issues/729)) +- Optimize the Dockerfile to speed up image rebuilds following a code change. ([\#732](https://github.com/matrix-org/matrix-appservice-slack/issues/732)) +- Update the provisioning API to use `matrix-appservice-bridge`. ([\#733](https://github.com/matrix-org/matrix-appservice-slack/issues/733)) + + 2.0.2 (2022-11-30) ================== diff --git a/changelog.d/729.misc b/changelog.d/729.misc deleted file mode 100644 index 8b609ac71..000000000 --- a/changelog.d/729.misc +++ /dev/null @@ -1 +0,0 @@ -Correctly attribute mkarg for documentation contributions. We also reverted commits and recommited them with the correct Author value set. \ No newline at end of file diff --git a/changelog.d/732.misc b/changelog.d/732.misc deleted file mode 100644 index f1673bad3..000000000 --- a/changelog.d/732.misc +++ /dev/null @@ -1 +0,0 @@ -Optimize the Dockerfile to speed up image rebuilds following a code change. diff --git a/changelog.d/733.misc b/changelog.d/733.misc deleted file mode 100644 index fa800876e..000000000 --- a/changelog.d/733.misc +++ /dev/null @@ -1 +0,0 @@ -Update the provisioning API to use `matrix-appservice-bridge`. diff --git a/changelog.d/734.misc b/changelog.d/734.misc deleted file mode 100644 index 45a2b3427..000000000 --- a/changelog.d/734.misc +++ /dev/null @@ -1 +0,0 @@ -Add a new UI widget for linking and unlinking channels from within a Matrix room. diff --git a/changelog.d/735.misc b/changelog.d/735.misc deleted file mode 100644 index 45a2b3427..000000000 --- a/changelog.d/735.misc +++ /dev/null @@ -1 +0,0 @@ -Add a new UI widget for linking and unlinking channels from within a Matrix room. diff --git a/package.json b/package.json index 66015cf68..dd5c93989 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-slack", - "version": "2.0.2", + "version": "2.1.0", "description": "A Matrix <--> Slack bridge", "engines": { "node": ">=16 <=18"