summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-29 15:42:58 +0000
committerErik Johnston <erik@matrix.org>2019-10-29 15:42:58 +0000
commitd6e40e7cbd351fa24beb3f46025b1a018b02cc97 (patch)
treec3461a4abedfb28a984bb000d8de8ae3a64473da /synapse/__init__.py
parentNewsfile (diff)
parentFix CI for synapse_port_db (#6276) (diff)
downloadsynapse-d6e40e7cbd351fa24beb3f46025b1a018b02cc97.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replication_async
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 d0f92ffbf3..8587ffa76f 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.5.0rc2"
+__version__ = "1.5.0"
 
 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