Merge branch 'master' into develop

This commit is contained in:
Olivier Wilkinson (reivilibre) 2020-07-30 15:18:36 +01:00
commit 3aa36b782c
17 changed files with 463 additions and 236 deletions

View file

@ -48,7 +48,7 @@ try:
except ImportError:
pass
__version__ = "1.18.0rc2"
__version__ = "1.18.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