summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrewm@element.io>2022-05-03 11:51:24 +0100
committerAndrew Morgan <andrewm@element.io>2022-05-03 11:51:24 +0100
commit13e4386710243860ccf1b6b8127c7a3b89df2e2c (patch)
tree580f82c1112d1accb405578965999199cc1b0bd5
parentAdd sanity checks to the release script (#12556) (diff)
parentMove groups/communities deprecation notice to 1.58.0 heading (diff)
downloadsynapse-13e4386710243860ccf1b6b8127c7a3b89df2e2c.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md10
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
3 files changed, 15 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 1fbe0815de..31f1561274 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+Synapse 1.58.0 (2022-05-03)
+===========================
+
+As of this release, the groups/communities feature in Synapse is now disabled by default. See [\#11584](https://github.com/matrix-org/synapse/issues/11584) for details. As mentioned in [the upgrade notes](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1580), this feature will be removed in Synapse 1.61.
+
+No significant changes since 1.58.0rc2.
+
+
 Synapse 1.58.0rc2 (2022-04-26)
 ==============================
 
@@ -19,8 +27,6 @@ Internal Changes
 Synapse 1.58.0rc1 (2022-04-26)
 ==============================
 
-As of this release, the groups/communities feature in Synapse is now disabled by default. See [\#11584](https://github.com/matrix-org/synapse/issues/11584) for details. As mentioned in [the upgrade notes](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1580), this feature will be removed in Synapse 1.61.
-
 Features
 --------
 
diff --git a/debian/changelog b/debian/changelog
index 5f1bf872bb..53b2387776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.58.0) stable; urgency=medium
+
+  * New Synapse release 1.58.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 03 May 2022 10:52:58 +0100
+
 matrix-synapse-py3 (1.58.0~rc2) stable; urgency=medium
 
   * New Synapse release 1.58.0rc2.
diff --git a/pyproject.toml b/pyproject.toml
index e6f2dc16cd..62e26fd95b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.58.0rc2"
+version = "1.58.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"