summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-03-23 13:54:29 +0000
committerRichard van der Hoff <richard@matrix.org>2020-03-23 13:54:29 +0000
commit5126cb1253d89ba196fcc828319bf195c866588a (patch)
tree3810df923cfe63ddc569f583a32867e75f7279a7 /synapse
parentFix processing of `groups` stream, and use symbolic names for streams (#7117) (diff)
parentMerge tag 'v1.12.0' (diff)
downloadsynapse-5126cb1253d89ba196fcc828319bf195c866588a.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 020e0536be..5b86008945 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.12.0rc1" +__version__ = "1.12.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