summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-07-08 11:25:34 +0100
committerRichard van der Hoff <richard@matrix.org>2020-07-08 11:25:34 +0100
commit59ddcd790b76e0b86774c1c3b63ef1cd5d968ae1 (patch)
tree047c6c84bc2b7aae934ce01be292d5e47e9266fe /synapse
parentChange Caddy links (old is deprecated) (#7789) (diff)
parentshuffle changelog slightly (diff)
downloadsynapse-59ddcd790b76e0b86774c1c3b63ef1cd5d968ae1.tar.xz
Merge branch 'master' into develop
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 0ffbcae502..de65ce6db8 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.16.0rc2" +__version__ = "1.16.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