From 69699a9bd11822635fcf2166f5dec2ce2365219c Mon Sep 17 00:00:00 2001
From: "Olivier Wilkinson (reivilibre)" <oliverw@matrix.org>
Date: Tue, 18 Jul 2023 14:06:00 +0100
Subject: [PATCH] 1.88.0

---
 CHANGES.md             | 10 +++++++++-
 changelog.d/15953.misc |  1 -
 debian/changelog       |  6 ++++++
 pyproject.toml         |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/15953.misc

diff --git a/CHANGES.md b/CHANGES.md
index 22d56a9a0..f379c994f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-# Synapse 1.88.0rc1 (2023-07-11)
+# Synapse 1.88.0 (2023-07-18)
 
 This release
  - raises the minimum supported version of Python to 3.8, as Python 3.7 is now [end-of-life](https://devguide.python.org/versions/), and
@@ -6,6 +6,14 @@ This release
 
 See [the upgrade notes](https://github.com/matrix-org/synapse/blob/release-v1.88/docs/upgrade.md#upgrading-to-v1880) for more information.
 
+
+### Bugfixes
+
+- Revert "Stop writing to column `user_id` of tables `profiles` and `user_filters`", which was introduced in Synapse 1.88.0rc1. ([\#15953](https://github.com/matrix-org/synapse/issues/15953))
+
+
+# Synapse 1.88.0rc1 (2023-07-11)
+
 ### Features
 
 - Add `not_user_type` param to the [list accounts admin API](https://matrix-org.github.io/synapse/v1.88/admin_api/user_admin_api.html#list-accounts). ([\#15844](https://github.com/matrix-org/synapse/issues/15844))
diff --git a/changelog.d/15953.misc b/changelog.d/15953.misc
deleted file mode 100644
index a20e78178..000000000
--- a/changelog.d/15953.misc
+++ /dev/null
@@ -1 +0,0 @@
-Revert "Stop writing to column user_id of tables profiles and user_filters`.
diff --git a/debian/changelog b/debian/changelog
index 763edb8ec..a369e0e5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.88.0) stable; urgency=medium
+
+  * New Synapse release 1.88.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 18 Jul 2023 13:59:28 +0100
+
 matrix-synapse-py3 (1.88.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.88.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index d56602b2d..4382ff38e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.88.0rc1"
+version = "1.88.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"