Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation_server_async_await

This commit is contained in:
Erik Johnston 2019-10-29 15:52:39 +00:00
commit 74c1e16106
13 changed files with 96 additions and 62 deletions

View file

@ -36,7 +36,7 @@ try:
except ImportError:
pass
__version__ = "1.5.0rc2"
__version__ = "1.5.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