Merge branch 'master' into develop

This commit is contained in:
Brendan Abolivier 2021-11-30 14:28:30 +00:00
commit b14f8a1baf
72 changed files with 101 additions and 71 deletions

View file

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