summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-10-18 12:35:13 +0100
committerRichard van der Hoff <richard@matrix.org>2019-10-18 12:35:13 +0100
commit2b22faded76d8813d1145ac673eca16e9787f6ce (patch)
treee33a517f865be8f2113ddfead3f24c6b83faef4a /synapse/__init__.py
parentMerge remote-tracking branch 'origin/develop' into rav/event_auth/1 (diff)
parentFix logging config for the docker image (#6197) (diff)
downloadsynapse-2b22faded76d8813d1145ac673eca16e9787f6ce.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/event_auth/1
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