Merge branch 'master' into develop

This commit is contained in:
Patrick Cloke 2020-05-19 09:56:15 -04:00
commit 02919bf4d8
6 changed files with 58 additions and 32 deletions

View file

@ -36,7 +36,7 @@ try:
except ImportError:
pass
__version__ = "1.13.0rc3"
__version__ = "1.13.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