summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-12-18 10:16:39 +0000
committerRichard van der Hoff <richard@matrix.org>2019-12-18 10:16:39 +0000
commit91ccfe9f37ae0467a1b1b82640034d6b3e8174a2 (patch)
treee9ba071fe33edeb018238e2bb7040804e70fda8e /synapse/__init__.py
parentMerge release-v1.7.1 into develop (diff)
parentMerge tag 'v1.7.1' (diff)
downloadsynapse-91ccfe9f37ae0467a1b1b82640034d6b3e8174a2.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 d3cf7b3d7b..e951bab593 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.7.0"
+__version__ = "1.7.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