summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-28 17:03:14 +0100
committerErik Johnston <erik@matrix.org>2021-05-28 17:03:14 +0100
commit6b6c6a02db8861c2235257ab2304b23cdd08c3ac (patch)
tree6e529462b72c809a2794daef538874cfa1a44e26 /synapse/__init__.py
parentLimit the number of events sent over replication when persisting events. (#10... (diff)
parent 1.35.0rc2 (diff)
downloadsynapse-6b6c6a02db8861c2235257ab2304b23cdd08c3ac.tar.xz
Merge remote-tracking branch 'origin/release-v1.35.0' into release-v1.35
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
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