summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-07-02 11:06:35 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-07-02 11:06:35 -0400
commit1319e532518ce39ab012c3e411ad3cdf8424cda6 (patch)
treef23154bd51c84f5a47509877c2a359c66ffcbd00 /synapse
parentMerge branch 'master' into release-v1.16.0 (diff)
downloadsynapse-1319e532518ce39ab012c3e411ad3cdf8424cda6.tar.xz
1.16.0rc2
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 f5cd8271a6..0ffbcae502 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.16.0rc1" +__version__ = "1.16.0rc2" 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