summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-06-16 11:29:33 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-06-16 11:29:33 +0100
commitfea4b1d6ad33b75491cab9c4ccfe00a1b82a7dff (patch)
treea5174fc0576e855546b77a6e6a330bbe6a8321e0 /synapse
parentMerge branch 'release-v1.15.1' into matrix-org-hotfixes (diff)
parentFix changelog wording (diff)
downloadsynapse-fea4b1d6ad33b75491cab9c4ccfe00a1b82a7dff.tar.xz
Merge branch 'release-v1.15.1' into matrix-org-hotfixes
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 1d9d85a727..4d39996a2e 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.15.0" +__version__ = "1.15.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