summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:25:09 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:25:09 +0100
commit51fe8b4a04aa5e88cdcff63ed32881d64a4f6968 (patch)
tree8117452ccbb4d5d7243fe5ad2a8c87f086be1d3a /synapse
parentMerge commit 'dc22090a6' into anoa/dinsic_release_1_21_x (diff)
parent1.19.0 (diff)
downloadsynapse-51fe8b4a04aa5e88cdcff63ed32881d64a4f6968.tar.xz
Merge commit 'ea4e4d2f0' into anoa/dinsic_release_1_21_x
* commit 'ea4e4d2f0':
  1.19.0
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 832a8e2014..f493cbd7d1 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.19.0rc1" +__version__ = "1.19.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