Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2020-07-08 11:25:34 +01:00
commit 59ddcd790b
3 changed files with 17 additions and 6 deletions

View file

@ -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