Merge branch 'master' into develop

This commit is contained in:
Andrew Morgan 2019-11-28 12:08:02 +00:00
commit 96562131a4
3 changed files with 22 additions and 1 deletions

View file

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