summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2022-01-18 11:46:24 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2022-01-18 11:46:24 +0000
commit47961ea85522df3f3af8f31d5ecdc815828ddf46 (patch)
tree1531a3a2f5f40470573a19b0dd628362157cc5da /synapse
parentAdd a flag to the `synapse_review_recent_signups` script to ignore and filter... (diff)
parentMove python/postgres deprecation notice to the top of 1.50 changelog (diff)
downloadsynapse-47961ea85522df3f3af8f31d5ecdc815828ddf46.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 f2dac4e7de..201925e91d 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.50.0rc2" +__version__ = "1.50.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