Merge branch 'master' into develop

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/__init__.py b/synapse/__init__.py

index fc2a6e4ee6..d3cf7b3d7b 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.7.0rc2"
+__version__ = "1.7.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