Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2019-11-06 13:51:11 +00:00
commit 915903eada
6 changed files with 18 additions and 3 deletions

View file

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