Merge branch 'master' into develop

This commit is contained in:
Erik Johnston 2021-06-15 15:52:24 +01:00
commit d09e24a52d
3 changed files with 13 additions and 1 deletions

View file

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