summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-08-10 14:23:57 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-08-10 14:23:57 +0100
commitb5de77cf8677c1cea0c686f6c92abc3c2f370d7b (patch)
treeed6c78c28bb0e6f830aad163c1f3ff6de92eba86 /synapse
parentWhen redacting, keep event fields around that maintain the historical event s... (diff)
parent 1.40.0 (diff)
downloadsynapse-b5de77cf8677c1cea0c686f6c92abc3c2f370d7b.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 5cca899f7d..919293cd80 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.40.0rc3" +__version__ = "1.40.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