From ca27b516656223150d218bdd838df302fedf838c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 2 Apr 2024 17:17:02 +0100
Subject: [PATCH] 1.104.0

---
 CHANGES.md                | 7 +++++++
 changelog.d/17031.feature | 1 -
 debian/changelog          | 6 ++++++
 pyproject.toml            | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/17031.feature

diff --git a/CHANGES.md b/CHANGES.md
index fa9af218a..168e29f1b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+# Synapse 1.104.0 (2024-04-02)
+
+### Bugfixes
+
+- Fix regression when using OIDC provider. Introduced in v1.104.0rc1. ([\#17031](https://github.com/element-hq/synapse/issues/17031))
+
+
 # Synapse 1.104.0rc1 (2024-03-26)
 
 ### Features
diff --git a/changelog.d/17031.feature b/changelog.d/17031.feature
deleted file mode 100644
index 0f28cbbcd..000000000
--- a/changelog.d/17031.feature
+++ /dev/null
@@ -1 +0,0 @@
-OIDC: try to JWT decode userinfo response if JSON parsing failed.
diff --git a/debian/changelog b/debian/changelog
index b915b6e2c..28451044a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.104.0) stable; urgency=medium
+
+  * New Synapse release 1.104.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 02 Apr 2024 17:15:45 +0100
+
 matrix-synapse-py3 (1.104.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.104.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 836913930..9a645079c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.104.0rc1"
+version = "1.104.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"