summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2022-02-08 13:26:09 +0000
committerBrendan Abolivier <babolivier@matrix.org>2022-02-08 13:26:09 +0000
commit6b91315ddf92c327e7f4414794c9b195030d954c (patch)
tree805a67012f500497cbe5ed3dd46f4bae45c93caa /synapse
parentAdd missing type hints to synapse.replication.http. (#11856) (diff)
parentMerge branch 'release-v1.52' (diff)
downloadsynapse-6b91315ddf92c327e7f4414794c9b195030d954c.tar.xz
Merge branch 'master' 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 5e65033061..a23563937a 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.52.0rc1" +__version__ = "1.52.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