From b1bc26a909f4f9af137e72ab27952a8d2dfc1cb3 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 27 May 2021 14:46:24 +0100
Subject: [PATCH]  1.35.0rc2

---
 CHANGES.md               | 9 +++++++++
 changelog.d/10079.bugfix | 1 -
 synapse/__init__.py      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/10079.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 0e451f983c..1fac16580d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.35.0rc2 (2021-05-27)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request. ([\#10079](https://github.com/matrix-org/synapse/issues/10079))
+
+
 Synapse 1.35.0rc1 (2021-05-25)
 ==============================
 
diff --git a/changelog.d/10079.bugfix b/changelog.d/10079.bugfix
deleted file mode 100644
index 2b93c4534a..0000000000
--- a/changelog.d/10079.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e60e9db71e..6faf31dbbc 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.35.0rc1"
+__version__ = "1.35.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