summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-06 15:07:28 +0100
committerErik Johnston <erik@matrix.org>2021-05-06 15:07:28 +0100
commite11cd368b73658b51dcfba483db8f0af0979e071 (patch)
treeeca9d8a38eb32aa3d0893129f2db5090e9cc03a1 /synapse/__init__.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentRevert "Leave out optional keys from /sync (#9919)" (#9940) (diff)
downloadsynapse-e11cd368b73658b51dcfba483db8f0af0979e071.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 5eac40730a..441cd8b339 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.33.0" +__version__ = "1.33.1" 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