summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-06-11 13:43:55 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-06-11 13:43:55 +0100
commit0d29112624c8034d7ace73674c151c74cb8addbb (patch)
tree2f05c8bd10e67ac16a5d0bd88ab56394ad7a81f2 /synapse
parentMerge tag 'v1.15.0rc1' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parent1.15.0 (diff)
downloadsynapse-0d29112624c8034d7ace73674c151c74cb8addbb.tar.xz
Merge branch 'release-v1.15.0' into matrix-org-hotfixes
Diffstat (limited to '')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 39c3a3ba4d..1d9d85a727 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.15.0rc1" +__version__ = "1.15.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