From dc8003f9216efa76133677ddaa32d2861753a91e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 22 Apr 2020 14:29:39 +0100
Subject: [PATCH] 1.12.4rc1

---
 CHANGES.md               | 18 ++++++++++++++++++
 changelog.d/7160.feature |  1 -
 changelog.d/7255.bugfix  |  1 -
 changelog.d/7271.bugfix  |  1 -
 changelog.d/7289.bugfix  |  1 -
 changelog.d/7311.feature |  1 -
 6 files changed, 18 insertions(+), 5 deletions(-)
 delete mode 100644 changelog.d/7160.feature
 delete mode 100644 changelog.d/7255.bugfix
 delete mode 100644 changelog.d/7271.bugfix
 delete mode 100644 changelog.d/7289.bugfix
 delete mode 100644 changelog.d/7311.feature

diff --git a/CHANGES.md b/CHANGES.md
index e78c8e48e7a3..1ccc39f4a504 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,21 @@
+Synapse 1.12.4rc1 (2020-04-22)
+==============================
+
+Features
+--------
+
+- Always send users their own device updates. ([\#7160](https://github.com/matrix-org/synapse/issues/7160))
+- Add support for handling GET requests for account_data on a worker. ([\#7311](https://github.com/matrix-org/synapse/issues/7311))
+
+
+Bugfixes
+--------
+
+- Fix a bug that prevented cross-signing with users on worker-mode synapses. ([\#7255](https://github.com/matrix-org/synapse/issues/7255))
+- Do not treat display names as globs in push rules. ([\#7271](https://github.com/matrix-org/synapse/issues/7271))
+- Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. ([\#7289](https://github.com/matrix-org/synapse/issues/7289))
+
+
 Synapse 1.12.3 (2020-04-03)
 ===========================
 
diff --git a/changelog.d/7160.feature b/changelog.d/7160.feature
deleted file mode 100644
index c1205969a18f..000000000000
--- a/changelog.d/7160.feature
+++ /dev/null
@@ -1 +0,0 @@
-Always send users their own device updates.
diff --git a/changelog.d/7255.bugfix b/changelog.d/7255.bugfix
deleted file mode 100644
index a96d52256fcd..000000000000
--- a/changelog.d/7255.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug that prevented cross-signing with users on worker-mode synapses.
\ No newline at end of file
diff --git a/changelog.d/7271.bugfix b/changelog.d/7271.bugfix
deleted file mode 100644
index e8315e4ce457..000000000000
--- a/changelog.d/7271.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Do not treat display names as globs in push rules.
diff --git a/changelog.d/7289.bugfix b/changelog.d/7289.bugfix
deleted file mode 100644
index 84699e50a9ad..000000000000
--- a/changelog.d/7289.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver.
diff --git a/changelog.d/7311.feature b/changelog.d/7311.feature
deleted file mode 100644
index c3adc1d6e725..000000000000
--- a/changelog.d/7311.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for handling GET requests for account_data on a worker.