summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-28 11:40:33 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-28 11:40:33 +0000
commit0b5e2c8093de79c43d857cb4eb3b9ad7eeb87d2c (patch)
tree6419a148f286eee8f8c73ea389628105e11f9ad4 /synapse/__init__.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parent1.6.1 (diff)
downloadsynapse-0b5e2c8093de79c43d857cb4eb3b9ad7eeb87d2c.tar.xz
Merge branch 'release-v1.6.1' of github.com:matrix-org/synapse 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 53eedc0048..f99de2f3f3 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.6.0" +__version__ = "1.6.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