summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-06 10:25:53 +0100
committerErik Johnston <erik@matrix.org>2021-05-06 10:25:53 +0100
commita8f48246b64a2019e5167a9427517b05afe718a0 (patch)
tree68325cf8b1f12b42d6252d1314890e78708b9200 /synapse/__init__.py
parentMerge branch 'release-v1.33.0' of github.com:matrix-org/synapse into matrix-o... (diff)
parentFollow-up to #9915 to correct the identifier for room types. (diff)
downloadsynapse-a8f48246b64a2019e5167a9427517b05afe718a0.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
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 5bbaa62de2..5eac40730a 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.33.0rc1" +__version__ = "1.33.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