From 623abbeb8d77c4f83ef56446d70d3a4a6b1fc7f6 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 14 May 2020 11:01:24 +0100
Subject: [PATCH] 1.13.0rc2

---
 CHANGES.md              | 16 ++++++++++++++++
 changelog.d/7376.bugfix |  1 -
 changelog.d/7470.misc   |  1 -
 changelog.d/7483.bugfix |  1 -
 synapse/__init__.py     |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/7376.bugfix
 delete mode 100644 changelog.d/7470.misc
 delete mode 100644 changelog.d/7483.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index f516dcf0d..70e11c8a6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,19 @@
+Synapse 1.13.0rc2 (2020-05-14)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug which could cause messages not to be sent over federation, when state events with state keys matching user IDs (such as custom user statuses) were received. ([\#7376](https://github.com/matrix-org/synapse/issues/7376))
+- Restore compatibility with non-compliant clients during the user interactive authentication process. ([\#7483](https://github.com/matrix-org/synapse/issues/7483))
+
+
+Internal Changes
+----------------
+
+- Fix linting errors in new version of Flake8. ([\#7470](https://github.com/matrix-org/synapse/issues/7470))
+
+
 Synapse 1.13.0rc1 (2020-05-11)
 ==============================
 
diff --git a/changelog.d/7376.bugfix b/changelog.d/7376.bugfix
deleted file mode 100644
index b7b67e328..000000000
--- a/changelog.d/7376.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug which could cause messages not to be sent over federation, when state events with state keys matching user IDs (such as custom user statuses) were received.
diff --git a/changelog.d/7470.misc b/changelog.d/7470.misc
deleted file mode 100644
index 45e66ecf4..000000000
--- a/changelog.d/7470.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix linting errors in new version of Flake8.
diff --git a/changelog.d/7483.bugfix b/changelog.d/7483.bugfix
deleted file mode 100644
index e1bc32461..000000000
--- a/changelog.d/7483.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Restore compatibility with non-compliant clients during the user interactive authentication process.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6cd16a820..977e26a04 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.13.0rc1"
+__version__ = "1.13.0rc2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when