From a9f555308fb7485ebb1df98e6c327808915f816f Mon Sep 17 00:00:00 2001
From: Half-Shot <will@half-shot.uk>
Date: Mon, 31 Jul 2023 09:59:43 +0100
Subject: [PATCH] 2.1.2

---
 CHANGELOG.md            | 29 +++++++++++++++++++++++++++++
 changelog.d/744.feature |  1 -
 changelog.d/750.feature |  1 -
 changelog.d/751.bugfix  |  1 -
 changelog.d/765.misc    |  2 --
 package.json            |  2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/744.feature
 delete mode 100644 changelog.d/750.feature
 delete mode 100644 changelog.d/751.bugfix
 delete mode 100644 changelog.d/765.misc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2335aa377..d5e87886b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+2.1.2 (2023-07-31)
+==================
+
+It is **strongly** reccomended you upgrade your bridge, as this release contains security fixes.
+
+🔒 Security
+-----------
+
+- Fixes for GHSA-vc7j-h8xg-fv5x.
+
+Features
+--------
+
+- Add improved error messages in setup widget. ([\#744](https://github.com/matrix-org/matrix-appservice-slack/issues/744))
+- Add support for specifying a HTTP proxy to connect to the Slack API. ([\#750](https://github.com/matrix-org/matrix-appservice-slack/issues/750))
+
+
+Bugfixes
+--------
+
+- Fix the provisioner staring once per bridged room. ([\#751](https://github.com/matrix-org/matrix-appservice-slack/issues/751))
+
+
+Internal Changes
+----------------
+
+- Update matrix-appservice-bridge to 8.1.2. ([\#765](https://github.com/matrix-org/matrix-appservice-slack/issues/765))
+
+
 2.1.1 (2023-03-07)
 ==================
 
diff --git a/changelog.d/744.feature b/changelog.d/744.feature
deleted file mode 100644
index 0e42f6810..000000000
--- a/changelog.d/744.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add improved error messages in setup widget.
diff --git a/changelog.d/750.feature b/changelog.d/750.feature
deleted file mode 100644
index da974bea2..000000000
--- a/changelog.d/750.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for specifying a HTTP proxy to connect to the Slack API.
diff --git a/changelog.d/751.bugfix b/changelog.d/751.bugfix
deleted file mode 100644
index 08dd8c171..000000000
--- a/changelog.d/751.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix the provisioner staring once per bridged room.
diff --git a/changelog.d/765.misc b/changelog.d/765.misc
deleted file mode 100644
index 6837c7f0f..000000000
--- a/changelog.d/765.misc
+++ /dev/null
@@ -1,2 +0,0 @@
-Update matrix-appservice-bridge to 8.1.2.
-
diff --git a/package.json b/package.json
index e29053eb0..d4a27436a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "A Matrix <--> Slack bridge",
   "engines": {
     "node": ">=16 <=18"