summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-06-03 08:18:22 -0400
committerPatrick Cloke <patrickc@matrix.org>2021-06-03 08:18:22 -0400
commit57c01dca297b7e14eb7be2b40d80f7577002754f (patch)
treed25c54d630e7976ed51e6be0d0712d725006177c
parentDo not show invite-only rooms in spaces summary (unless joined/invited). (#10... (diff)
downloadsynapse-57c01dca297b7e14eb7be2b40d80f7577002754f.tar.xz
1.35.1
Diffstat (limited to '')
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/10109.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index f03a53affc..5794f2bffd 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 users in a space who were not invited. ([\#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