From f9b4b5c1dd5dbb4ae3b767ee4352d374602ab088 Mon Sep 17 00:00:00 2001
From: Andrew Ferrazzutti <andrewf@element.io>
Date: Wed, 30 Nov 2022 17:21:12 -0500
Subject: [PATCH] 2.0.2-rc2

---
 CHANGELOG.md           | 16 ++++++++++++++++
 changelog.d/551.misc   |  1 -
 changelog.d/725.bugfix |  1 -
 changelog.d/727.misc   |  1 -
 package.json           |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/551.misc
 delete mode 100644 changelog.d/725.bugfix
 delete mode 100644 changelog.d/727.misc

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bc23a3b3..adcf2717a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+2.0.2-rc2 (2022-11-30)
+======================
+
+Bugfixes
+--------
+
+- Safely handle errors from admin commands. ([\#725](https://github.com/matrix-org/matrix-appservice-slack/issues/725))
+
+
+Internal Changes
+----------------
+
+- Docs: Consistently call the registration file slack-registration.yaml. ([\#551](https://github.com/matrix-org/matrix-appservice-slack/issues/551))
+- Docs: Clarify default port, fix indents and reduce abbreviations. ([\#727](https://github.com/matrix-org/matrix-appservice-slack/issues/727))
+
+
 2.0.2-rc1 (2022-11-28)
 ======================
 
diff --git a/changelog.d/551.misc b/changelog.d/551.misc
deleted file mode 100644
index 06e819311..000000000
--- a/changelog.d/551.misc
+++ /dev/null
@@ -1 +0,0 @@
-Docs: Consistently call the registration file slack-registration.yaml.
diff --git a/changelog.d/725.bugfix b/changelog.d/725.bugfix
deleted file mode 100644
index 81068bfa4..000000000
--- a/changelog.d/725.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Safely handle errors from admin commands.
diff --git a/changelog.d/727.misc b/changelog.d/727.misc
deleted file mode 100644
index 169c9b612..000000000
--- a/changelog.d/727.misc
+++ /dev/null
@@ -1 +0,0 @@
-Docs: Clarify default port, fix indents and reduce abbreviations.
\ No newline at end of file
diff --git a/package.json b/package.json
index 7d80c270e..474fc347c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-slack",
-  "version": "2.0.2-rc1",
+  "version": "2.0.2-rc2",
   "description": "A Matrix <--> Slack bridge",
   "engines": {
     "node": ">=16 <=18"