diff options
| author | Erik Johnston <erik@matrix.org> | 2021-05-28 17:03:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-05-28 17:03:14 +0100 |
| commit | 6b6c6a02db8861c2235257ab2304b23cdd08c3ac (patch) | |
| tree | 6e529462b72c809a2794daef538874cfa1a44e26 | |
| parent | Limit the number of events sent over replication when persisting events. (#10... (diff) | |
| parent | 1.35.0rc2 (diff) | |
| download | synapse-6b6c6a02db8861c2235257ab2304b23cdd08c3ac.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.35.0' into release-v1.35
| -rw-r--r-- | CHANGES.md | 9 | ||||
| -rw-r--r-- | changelog.d/10079.bugfix | 1 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
3 files changed, 10 insertions, 2 deletions
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 |