Merge branch 'master' into develop

This commit is contained in:
Patrick Cloke 2021-06-03 08:42:26 -04:00
commit d7a646abca
4 changed files with 16 additions and 2 deletions

View file

@ -47,7 +47,7 @@ try:
except ImportError:
pass
__version__ = "1.35.0"
__version__ = "1.35.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