From 7edda9271cccf3d6cca2b4c7048a4040328ecafa Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Tue, 27 Oct 2020 12:56:07 +0000
Subject: [PATCH] 0.2.0-rc2

---
 CHANGELOG.md            | 17 +++++++++++++++++
 changelog.d/184.bugfix  |  1 -
 changelog.d/185.bugfix  |  1 -
 changelog.d/188.feature |  1 -
 changelog.d/189.bugfix  |  1 -
 package.json            |  2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/184.bugfix
 delete mode 100644 changelog.d/185.bugfix
 delete mode 100644 changelog.d/188.feature
 delete mode 100644 changelog.d/189.bugfix

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc68208e..5ecae97a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+ 0.2.0-rc2 (2020-10-27)
+=======================
+
+Features
+--------
+
+- Check if a MUC room exists before creating a portal ([\#188](https://github.com/matrix-org/matrix-bifrost/issues/188))
+
+
+Bugfixes
+--------
+
+- XMPP self-pings to gateways will now return an error if the device is not in a MUC ([\#184](https://github.com/matrix-org/matrix-bifrost/issues/184))
+- The bridge will no longer part remote users who have another device joined to a gateway room ([\#185](https://github.com/matrix-org/matrix-bifrost/issues/185))
+- Ensure stanzas are emitted in the right order when an XMPP user joins a MUC ([\#189](https://github.com/matrix-org/matrix-bifrost/issues/189))
+
+
 0.2.0-rc1 (2020-10-22)
 =======================
 
diff --git a/changelog.d/184.bugfix b/changelog.d/184.bugfix
deleted file mode 100644
index deada700..00000000
--- a/changelog.d/184.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-XMPP self-pings to gateways will now return an error if the device is not in a MUC
\ No newline at end of file
diff --git a/changelog.d/185.bugfix b/changelog.d/185.bugfix
deleted file mode 100644
index dae84212..00000000
--- a/changelog.d/185.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-The bridge will no longer part remote users who have another device joined to a gateway room
\ No newline at end of file
diff --git a/changelog.d/188.feature b/changelog.d/188.feature
deleted file mode 100644
index d6a4a169..00000000
--- a/changelog.d/188.feature
+++ /dev/null
@@ -1 +0,0 @@
-Check if a MUC room exists before creating a portal
diff --git a/changelog.d/189.bugfix b/changelog.d/189.bugfix
deleted file mode 100644
index 575abe18..00000000
--- a/changelog.d/189.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure stanzas are emitted in the right order when an XMPP user joins a MUC
diff --git a/package.json b/package.json
index cef56f2c..650c4999 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-bifrost",
-  "version": "0.2.0-rc1",
+  "version": "0.2.0-rc2",
   "description": "Multi protocol bridging for Matrix.",
   "main": "index.js",
   "scripts": {