summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-11-06 13:51:11 +0000
committerRichard van der Hoff <richard@matrix.org>2019-11-06 13:51:11 +0000
commit915903eadaeea1944ed42c79636dd94d4aa98f64 (patch)
tree986626d7f935d4acbbccf873ac870f3887354e42 /synapse
parentFix bug which caused rejected events to be stored with the wrong room state ... (diff)
parentMerge branch 'release-v1.5.1' (diff)
downloadsynapse-915903eadaeea1944ed42c79636dd94d4aa98f64.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 8587ffa76f..ec16f54a49 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.5.0" +__version__ = "1.5.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