Merge branch 'release-v1.10.0' into develop

This commit is contained in:
Richard van der Hoff 2020-02-11 11:12:31 +00:00
commit 88d41e94f5
2 changed files with 11 additions and 7 deletions

View file

@ -36,7 +36,7 @@ try:
except ImportError:
pass
__version__ = "1.10.0rc4"
__version__ = "1.10.0rc5"
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