summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-12-31 12:07:35 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-12-31 12:07:35 +0000
commit8c2f42374b083eacd7216d576437235b37f9e2ea (patch)
treecda29204576f715074f18118ec6005eec46b413f /synapse
parentMerge commit '7a3adbd7a' into anoa/dinsic_release_1_23_1 (diff)
parent1.22.0 (diff)
downloadsynapse-8c2f42374b083eacd7216d576437235b37f9e2ea.tar.xz
Merge commit 'fedfdfd75' into anoa/dinsic_release_1_23_1
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 24a5815447..35a82c0bfe 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.22.0rc2" +__version__ = "1.22.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