summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-06-01 13:47:27 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-06-01 13:47:27 +0100
commit3ff6fe28517aea952b9f27b66f5e467f8fc1e494 (patch)
treed81a9deeb35570458c874cf8d454eb859eba6cc7 /synapse/__init__.py
parentadd a cache to have_seen_event (#9953) (diff)
parentMerge v1.35.0rc3 into v1.35.0 due to incorrect tagging (diff)
downloadsynapse-3ff6fe28517aea952b9f27b66f5e467f8fc1e494.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 6faf31dbbc..d9843a1708 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.35.0rc2" +__version__ = "1.35.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