Merge remote-tracking branch 'origin/release-v1.35.0' into release-v1.35

2021-05-28 17:03:14 +01:00 · 2021-05-28 17:03:14 +01:00 · 6b6c6a02db
parent 9408b86f5c b1bc26a909
commit 6b6c6a02db
3 changed files with 10 additions and 2 deletions
--- 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)
 ==============================

--- a/changelog.d/10079.bugfix
+++ b/changelog.d/10079.bugfix
@ -1 +0,0 @@
-Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request.
--- 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
				`@ -1 +0,0 @@`
				`Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request.`