summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-01-23 13:45:23 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-01-23 13:45:23 +0000
commit51fc3f693ec70b9e2d0f8ce38873469d2cb2ff41 (patch)
treeb83036edcde8e6d89e2ff175633b61b0bd77dcc9 /synapse
parenta bit of debugging for media storage providers (#6757) (diff)
parentFixup changelog (diff)
downloadsynapse-51fc3f693ec70b9e2d0f8ce38873469d2cb2ff41.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 1c44ca0999..6236e13aa3 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.9.0rc1"
+__version__ = "1.9.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