summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-06-03 08:42:26 -0400
committerPatrick Cloke <patrickc@matrix.org>2021-06-03 08:43:38 -0400
commitd7a646abcadc14db8116dbcf07e05ae94a7c3271 (patch)
tree6675f5b0eac25b44c320d91e686363c8f34e7cf1 /synapse
parentAdd new admin APIs to remove media by media ID from quarantine. (#10044) (diff)
parentClarify changelog. (diff)
downloadsynapse-d7a646abcadc14db8116dbcf07e05ae94a7c3271.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
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