summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-06-11 13:27:27 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-06-11 13:27:27 +0100
commit3b3f327a0d73f81609399d194a13b42fd01e85f7 (patch)
treefe437819faf5d7e1173b41388ac2973cc0c342d1 /synapse
parentMerge branch 'release-v1.15.0' of github.com:matrix-org/synapse into release-... (diff)
downloadsynapse-3b3f327a0d73f81609399d194a13b42fd01e85f7.tar.xz
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 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