summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-28 17:15:01 +0100
committerErik Johnston <erik@matrix.org>2021-05-28 17:15:01 +0100
commita027b65c8ed7e63118829ac63edbabcecd1ac758 (patch)
tree101c6440e0b0597b39f5eb107a739198bd55aa95 /synapse/__init__.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentCHANGELOG (diff)
downloadsynapse-1.35.0rc3.tar.xz
Merge remote-tracking branch 'origin/release-v1.35' into matrix-org-hotfixes v1.35.0rc3
Diffstat (limited to '')
-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..4591246bd1 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.35.0rc2" +__version__ = "1.35.0rc3" 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