Merge branch 'master' into develop

This commit is contained in:
Brendan Abolivier 2021-05-05 14:25:49 +01:00
commit a61b13c0a1
4 changed files with 20 additions and 4 deletions

View file

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