Merge branch 'master' into develop

This commit is contained in:
Erik Johnston 2021-03-08 14:06:35 +00:00
commit b988b07bb0
3 changed files with 14 additions and 5 deletions

View file

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