Merge remote-tracking branch 'upstream/release-v1.31.0'

This commit is contained in:
Tulir Asokan 2021-04-06 15:28:49 +03:00
commit a7029e8aeb
8 changed files with 74 additions and 8 deletions

View file

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