From 795ae6106486da55b91622329013f99a9c25edb9 Mon Sep 17 00:00:00 2001
From: Mathieu Velten <mathieuv@matrix.org>
Date: Thu, 22 Jun 2023 15:19:14 +0200
Subject: [PATCH] v2.5.4

---
 CHANGELOG.md            | 11 +++++++++++
 changelog.d/557.misc    |  1 -
 changelog.d/566.feature |  1 -
 pyproject.toml          |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/557.misc
 delete mode 100644 changelog.d/566.feature

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d80f6da5..76de8b50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# Sydent 2.5.4 (2023-06-22)
+
+### Features
+
+- Add a config option `homeserver_allow_list` to specify which homeservers can access Sydent. ([\#566](https://github.com/matrix-org/sydent/issues/566))
+
+### Internal Changes
+
+- Warn would-be users that they probably don't want to use Sydent. ([\#557](https://github.com/matrix-org/sydent/issues/557))
+
+
 Sydent 2.5.3 (2023-03-02)
 =========================
 
diff --git a/changelog.d/557.misc b/changelog.d/557.misc
deleted file mode 100644
index 811b181c..00000000
--- a/changelog.d/557.misc
+++ /dev/null
@@ -1 +0,0 @@
-Warn would-be users that they probably don't want to use Sydent.
diff --git a/changelog.d/566.feature b/changelog.d/566.feature
deleted file mode 100644
index 8bd5cdde..00000000
--- a/changelog.d/566.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a config option `homeserver_allow_list` to specify which homeservers can access Sydent.
diff --git a/pyproject.toml b/pyproject.toml
index 2f5b971d..78f35fbb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -69,7 +69,7 @@ ignore_missing_imports = true
 
 [tool.poetry]
 name = "matrix-sydent"
-version = "2.5.3"
+version = "2.5.4"
 description = "Reference Matrix Identity Verification and Lookup Server"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"