summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:24:51 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:24:51 +0100
commit7dbde0333642eb32bdb62a381d2c49c4b38629bb (patch)
treec10b761ed08f2516784559af8fbc1c770ff21465 /synapse
parentMerge commit '53834bb9c' into anoa/dinsic_release_1_21_x (diff)
parent1.19.0rc1 (diff)
downloadsynapse-7dbde0333642eb32bdb62a381d2c49c4b38629bb.tar.xz
Merge commit '091ca3910' into anoa/dinsic_release_1_21_x
* commit '091ca3910':
  1.19.0rc1
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 f70381bc71..832a8e2014 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.18.0" +__version__ = "1.19.0rc1" 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