From 5984ada6bb340c736376ba94d766bf76ceeaf514 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 31 May 2022 13:41:49 +0100
Subject: [PATCH] 1.60.0

---
 CHANGES.md               | 13 +++++++++++--
 changelog.d/12918.bugfix |  1 -
 debian/changelog         |  6 ++++++
 pyproject.toml           |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/12918.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 40e362e920..de6bf95e43 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,5 @@
-Synapse 1.60.0rc2 (2022-05-27)
-==============================
+Synapse 1.60.0 (2022-05-31)
+===========================
 
 This release of Synapse adds a unique index to the `state_group_edges` table, in
 order to prevent accidentally introducing duplicate information (for example,
@@ -14,6 +14,15 @@ should update their modules to use the new signature where possible.
 See [the upgrade notes](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1600)
 for more details.
 
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.60.0rc1 that would break some imports from `synapse.module_api`. ([\#12918](https://github.com/matrix-org/synapse/issues/12918))
+
+
+Synapse 1.60.0rc2 (2022-05-27)
+==============================
+
 Features
 --------
 
diff --git a/changelog.d/12918.bugfix b/changelog.d/12918.bugfix
deleted file mode 100644
index 38bdd80700..0000000000
--- a/changelog.d/12918.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.60.0rc1 that would break some imports from `synapse.module_api`.
diff --git a/debian/changelog b/debian/changelog
index b6a51d6903..5d332cedef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.60.0) stable; urgency=medium
+
+  * New Synapse release 1.60.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 31 May 2022 13:41:22 +0100
+
 matrix-synapse-py3 (1.60.0~rc2) stable; urgency=medium
 
   * New Synapse release 1.60.0rc2.
diff --git a/pyproject.toml b/pyproject.toml
index 59cff590b5..75251c863d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.60.0rc2"
+version = "1.60.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"