Merge branch 'master' into develop

This commit is contained in:
Brendan Abolivier 2020-06-11 13:31:22 +01:00
commit 1ad06ee6eb
3 changed files with 16 additions and 4 deletions

View file

@ -36,7 +36,7 @@ try:
except ImportError:
pass
__version__ = "1.15.0rc1"
__version__ = "1.15.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