summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-05-28 14:12:46 +0200
committerBrendan Abolivier <babolivier@matrix.org>2020-05-28 14:12:46 +0200
commitd4220574a289ea09bdf63e8d48d5ff63713f1e0f (patch)
treef8e4d9681c8adaae8930d7e2ffba5bf5f73a04ba /synapse
parentMerge commit 'ef3934ec8f123f6f553b07471588fbcc7f444cd8' of github.com:matrix-... (diff)
parentUpdate debian changelog (diff)
downloadsynapse-d4220574a289ea09bdf63e8d48d5ff63713f1e0f.tar.xz
Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse 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 5e957985d7..f0105d3e2f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.14.0rc2" +__version__ = "1.14.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