Merge branch 'master' into develop

This commit is contained in:
Andrew Morgan 2020-09-22 16:00:30 +01:00
commit b29a9bdaa9
3 changed files with 24 additions and 3 deletions

View file

@ -48,7 +48,7 @@ try:
except ImportError:
pass
__version__ = "1.20.0rc5"
__version__ = "1.20.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