Merge branch 'master' into develop

This commit is contained in:
Patrick Cloke 2020-10-15 10:43:54 -04:00
commit 74976a8e43
4 changed files with 32 additions and 2 deletions

View file

@ -48,7 +48,7 @@ try:
except ImportError:
pass
__version__ = "1.21.1"
__version__ = "1.21.2"
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