From 37e6a9f2639afce3c7c42a5cc362cfb15da6143a Mon Sep 17 00:00:00 2001
From: Justin Carlson <justinc@element.io>
Date: Fri, 3 Mar 2023 14:01:55 -0500
Subject: [PATCH 1/2] Correct changelog type

---
 changelog.d/{734.misc => 734.feature} | 0
 changelog.d/{735.misc => 735.feature} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{734.misc => 734.feature} (100%)
 rename changelog.d/{735.misc => 735.feature} (100%)

diff --git a/changelog.d/734.misc b/changelog.d/734.feature
similarity index 100%
rename from changelog.d/734.misc
rename to changelog.d/734.feature
diff --git a/changelog.d/735.misc b/changelog.d/735.feature
similarity index 100%
rename from changelog.d/735.misc
rename to changelog.d/735.feature

From d7500b67667171447fde4a7c113844e7dd9c4ca0 Mon Sep 17 00:00:00 2001
From: Justin Carlson <justinc@element.io>
Date: Fri, 3 Mar 2023 14:03:56 -0500
Subject: [PATCH 2/2] 2.1.0

---
 CHANGELOG.md            | 17 +++++++++++++++++
 changelog.d/729.misc    |  1 -
 changelog.d/732.misc    |  1 -
 changelog.d/733.misc    |  1 -
 changelog.d/734.feature |  1 -
 changelog.d/735.feature |  1 -
 package.json            |  2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/729.misc
 delete mode 100644 changelog.d/732.misc
 delete mode 100644 changelog.d/733.misc
 delete mode 100644 changelog.d/734.feature
 delete mode 100644 changelog.d/735.feature

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.feature b/changelog.d/734.feature
deleted file mode 100644
index 45a2b3427..000000000
--- a/changelog.d/734.feature
+++ /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.feature b/changelog.d/735.feature
deleted file mode 100644
index 45a2b3427..000000000
--- a/changelog.d/735.feature
+++ /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"