summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-09 13:25:48 +0000
committerErik Johnston <erik@matrix.org>2020-01-09 13:25:48 +0000
commitd773290cb1d015f0debe5f64f4e495612cf1da60 (patch)
tree33a7294ddad2c3fbbcbbd7b4831b6813176515dd /synapse
parentMerge pull request #6664 from matrix-org/erikj/media_admin_apis (diff)
parentFixup changelog (diff)
downloadsynapse-d773290cb1d015f0debe5f64f4e495612cf1da60.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py

index a3bd855045..0dd538d804 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try: except ImportError: pass -__version__ = "1.8.0rc1" +__version__ = "1.8.0" 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