summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-09-06 15:38:03 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-09-06 15:38:03 +0100
commit92bbe0ebe1da56a2bc5c26eeb6cc9e5ad3904ab5 (patch)
treebf53235b84c6d634dd9ac5a65d150d866e24aa72 /synapse/__init__.py
parentMerge branch 'release-v1.42' of github.com:matrix-org/synapse into matrix-org... (diff)
parentMove the upgrade notes reminder up to rc2 (diff)
downloadsynapse-92bbe0ebe1da56a2bc5c26eeb6cc9e5ad3904ab5.tar.xz
Merge branch 'release-v1.42' 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 06d80f79b3..e4302d81a8 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.41.1" +__version__ = "1.42.0rc2" 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