summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-06-29 21:48:24 +0100
committerRichard van der Hoff <richard@matrix.org>2021-06-29 21:48:24 +0100
commitbc5589a1bb5fc9fbbd64f2dec3335e8eccd43640 (patch)
treebeb50fc8659d36ef8d9bc4ee0d06cd5c2ccfad17 /synapse
parentMerge branch 'release-v1.37' into develop (diff)
parent1.37.1rc1 (diff)
downloadsynapse-bc5589a1bb5fc9fbbd64f2dec3335e8eccd43640.tar.xz
Merge branch 'release-v1.37' 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 0900492619..2070724c34 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.37.1a1" +__version__ = "1.37.1rc1" 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