summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-26 14:15:30 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-26 14:15:30 +0000
commit9fb350af65e22b917ce5fe9b1a2f21cc9e8d833e (patch)
treee5204acaabdbcd361c70a2422d08672b003372d0 /synapse/__init__.py
parentPrevent account_data content from being sent over TCP replication (#6333) (diff)
parent1.6.0 (diff)
downloadsynapse-9fb350af65e22b917ce5fe9b1a2f21cc9e8d833e.tar.xz
Merge branch 'master' 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 051c83774e..53eedc0048 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.6.0rc2"
+__version__ = "1.6.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