diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-06-03 08:42:26 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-06-03 08:43:38 -0400 |
| commit | d7a646abcadc14db8116dbcf07e05ae94a7c3271 (patch) | |
| tree | 6675f5b0eac25b44c320d91e686363c8f34e7cf1 | |
| parent | Add new admin APIs to remove media by media ID from quarantine. (#10044) (diff) | |
| parent | Clarify changelog. (diff) | |
| download | synapse-d7a646abcadc14db8116dbcf07e05ae94a7c3271.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 9 | ||||
| -rw-r--r-- | changelog.d/10109.bugfix | 1 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md index f03a53affc..04d260f8e5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,12 @@ +Synapse 1.35.1 (2021-06-03) +=========================== + +Bugfixes +-------- + +- Fix a bug introduced in v1.35.0 where invite-only rooms would be shown to all users in a space, regardless of if the user had access to it. ([\#10109](https://github.com/matrix-org/synapse/issues/10109)) + + Synapse 1.35.0 (2021-06-01) =========================== diff --git a/changelog.d/10109.bugfix b/changelog.d/10109.bugfix deleted file mode 100644 index bc41bf9e5e..0000000000 --- a/changelog.d/10109.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a bug introduced in v1.35.0 where invite-only rooms would be shown to users in a space who were not invited. diff --git a/debian/changelog b/debian/changelog index d5efb8ccba..084e878def 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.35.1) stable; urgency=medium + + * New synapse release 1.35.1. + + -- Synapse Packaging team <packages@matrix.org> Thu, 03 Jun 2021 08:11:29 -0400 + matrix-synapse-py3 (1.35.0) stable; urgency=medium * New synapse release 1.35.0. diff --git a/synapse/__init__.py b/synapse/__init__.py index d9843a1708..445e8a5cad 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.35.0" +__version__ = "1.35.1" 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 |