summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-21 15:35:38 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-21 15:35:38 +0100
commit7ba1c6287574f3762537bbe7a9ab0d12d15a6c8c (patch)
treed0b0ffb2744e3fcace8312bfc4a2cee13b288a58 /synapse/__init__.py
parentMerge commit '1c9a85056' into anoa/dinsic_release_1_31_0 (diff)
parent1.25.0rc1 (diff)
downloadsynapse-7ba1c6287574f3762537bbe7a9ab0d12d15a6c8c.tar.xz
Merge commit '2fe0fb21f' into anoa/dinsic_release_1_31_0
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 f2d3ac68eb..99fb675748 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.24.0" +__version__ = "1.25.0rc1" 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