summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-11 10:43:47 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-11 10:43:47 +0000
commit605cd089f7e366506e16644c3ffb47dd01266c3e (patch)
tree9298a1a5f8603d1d1699cb2be72bdf30f515b983 /synapse/__init__.py
parentReject device display names that are too long (#6882) (diff)
parent1.10.0rc4 (diff)
downloadsynapse-605cd089f7e366506e16644c3ffb47dd01266c3e.tar.xz
Merge branch 'release-v1.10.0' into develop
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 36c0cf557a..cc69ff0c41 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.10.0rc3"
+__version__ = "1.10.0rc4"
 
 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