summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2022-03-16 12:22:07 -0400
committerPatrick Cloke <patrickc@matrix.org>2022-03-16 12:22:07 -0400
commit3f7cfbc9e5e82d17cd7782adcbe78e239aae5691 (patch)
tree35aaeba932f2ab5bd614ab9a946fe7967b6fca3e /synapse/__init__.py
parentHandle cancellation in `DatabasePool.runInteraction()` (#12199) (diff)
parentRe-generate changelog. (diff)
downloadsynapse-3f7cfbc9e5e82d17cd7782adcbe78e239aae5691.tar.xz
Merge branch 'release-v1.55' into develop
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 4b00565976..870707f476 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -68,7 +68,7 @@ try: except ImportError: pass -__version__ = "1.54.0" +__version__ = "1.55.0rc1" 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