From 5774ad170290934680cfef8c0dd8cf41ba88d4f1 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Wed, 21 Oct 2020 14:16:15 +0100
Subject: [PATCH] 2.3.0-rc1

---
 CHANGELOG.md            | 20 +++++++++++++++++++-
 changelog.d/251.feature |  1 -
 changelog.d/252.bugfix  |  1 -
 changelog.d/253.feature |  1 -
 changelog.d/254.feature |  1 -
 changelog.d/255.bugfix  |  1 -
 package.json            |  2 +-
 7 files changed, 20 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/251.feature
 delete mode 100644 changelog.d/252.bugfix
 delete mode 100644 changelog.d/253.feature
 delete mode 100644 changelog.d/254.feature
 delete mode 100644 changelog.d/255.bugfix

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e895170f..39072e86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,22 @@
- 2.2.0 (2020-10-15)
+ 2.3.0-rc1 (2020-10-21)
+=======================
+
+Features
+--------
+
+- Add `MembershipQueue` component ([\#251](https://github.com/matrix-org/matrix-appservice-bridge/issues/251))
+- Add function to ping the homeserver to check that the AS can be reached ([\#253](https://github.com/matrix-org/matrix-appservice-bridge/issues/253))
+- Add `uploadContent()`, and `setRoomDirectoryVisibility()` intent functions ([\#254](https://github.com/matrix-org/matrix-appservice-bridge/issues/254))
+
+
+Bugfixes
+--------
+
+- Fix a bug where the default configuration would be overwritten on validation ([\#252](https://github.com/matrix-org/matrix-appservice-bridge/issues/252))
+- Fix a bug where messages would be echoed to the bridge from the bot user, even if `suppressEcho` was on. ([\#255](https://github.com/matrix-org/matrix-appservice-bridge/issues/255))
+
+
+2.2.0 (2020-10-15)
 ===================
 
 No significant changes.
diff --git a/changelog.d/251.feature b/changelog.d/251.feature
deleted file mode 100644
index 8a7160bf..00000000
--- a/changelog.d/251.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add `MembershipQueue` component
diff --git a/changelog.d/252.bugfix b/changelog.d/252.bugfix
deleted file mode 100644
index 3dc9c06f..00000000
--- a/changelog.d/252.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where the default configuration would be overwritten on validation
diff --git a/changelog.d/253.feature b/changelog.d/253.feature
deleted file mode 100644
index d67dc6d2..00000000
--- a/changelog.d/253.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add function to ping the homeserver to check that the AS can be reached
diff --git a/changelog.d/254.feature b/changelog.d/254.feature
deleted file mode 100644
index f173a6dc..00000000
--- a/changelog.d/254.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add `uploadContent()`, and `setRoomDirectoryVisibility()` intent functions
diff --git a/changelog.d/255.bugfix b/changelog.d/255.bugfix
deleted file mode 100644
index c8b4b482..00000000
--- a/changelog.d/255.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where messages would be echoed to the bridge from the bot user, even if `suppressEcho` was on.
diff --git a/package.json b/package.json
index 4ff95a0d..4300033d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-appservice-bridge",
-  "version": "2.2.0",
+  "version": "2.3.0-rc1",
   "description": "Bridging infrastructure for Matrix Application Services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",