summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-08-20 07:53:27 -0400
committerPatrick Cloke <patrickc@matrix.org>2021-08-20 07:53:27 -0400
commitfe3466a8ade18774d31a2dfe0af1c3ddb52a3dce (patch)
treeb92e74d5bf60d6f3952a6e762993ddeb81d20f80 /synapse/__init__.py
parentMerge branch 'release-v1.41' of github.com:matrix-org/synapse into matrix-org... (diff)
parentSet room version 8 as preferred for restricted rooms. (#10571) (diff)
downloadsynapse-fe3466a8ade18774d31a2dfe0af1c3ddb52a3dce.tar.xz
Merge remote-tracking branch 'origin/release-v1.41' 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 919293cd80..6ada20a77f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.40.0" +__version__ = "1.41.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