Merge branch 'master' into develop

matrix-org · Oct 26, 2022 · 86b7d9b · 86b7d9b
2 parents 8756d5c + 23fa636
commit 86b7d9b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.70.0 (2022-10-26)
+===========================
+
+No significant changes since 1.70.0rc2.
+
+
 Synapse 1.70.0rc2 (2022-10-25)
 ==============================
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.70.0) stable; urgency=medium
+
+  * New Synapse release 1.70.0.
+
+ -- Synapse Packaging team <[email protected]>  Wed, 26 Oct 2022 11:11:50 +0100
+
 matrix-synapse-py3 (1.70.0~rc2) stable; urgency=medium
 
   * New Synapse release 1.70.0rc2.

diff --git a/pyproject.toml b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.70.0rc2"
+version = "1.70.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <[email protected]>"]
 license = "Apache-2.0"