summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-10-18 11:00:43 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-10-18 11:00:43 +0100
commit1ee97cbd0198fcf87ba0257eae9b099cf25aa772 (patch)
tree6b2a5552f42c17d60de14c8693fcf67ee714a706 /synapse/__init__.py
parentMerge pull request #6196 from matrix-org/erikj/await (diff)
parentMerge tag 'v1.4.1' (diff)
downloadsynapse-1ee97cbd0198fcf87ba0257eae9b099cf25aa772.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 e908b90177..ee3313a41c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.4.1rc1"
+__version__ = "1.4.1"
 
 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