summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-03 15:20:49 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-03-03 15:20:49 +0000
commit43f874055d1dfc70496db3c1ac7e962515e4ff94 (patch)
treed7274030db58fdca49cb03c316957d5907fa65e3 /synapse/__init__.py
parentValidate the alt_aliases property of canonical alias events (#6971) (diff)
parentUpdate debian changelog (diff)
downloadsynapse-43f874055d1dfc70496db3c1ac7e962515e4ff94.tar.xz
Merge branch 'master' 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 3406ce634f..e56ba89ff4 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.11.0" +__version__ = "1.11.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