Merge branch 'master' into develop

This commit is contained in:
Erik Johnston 2020-10-30 16:27:02 +00:00
commit f27a789697
5 changed files with 17 additions and 3 deletions

View file

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