From 83af73a08a301e88fbf096096132cecfbfabad7a Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Wed, 18 Sep 2019 22:30:07 +0100
Subject: Update and rename 6028.misc to 6028.feature

---
 changelog.d/6028.feature | 1 +
 changelog.d/6028.misc    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 changelog.d/6028.feature
 delete mode 100644 changelog.d/6028.misc

diff --git a/changelog.d/6028.feature b/changelog.d/6028.feature
new file mode 100644
index 0000000000..cf603fa0c6
--- /dev/null
+++ b/changelog.d/6028.feature
@@ -0,0 +1 @@
+Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`.
diff --git a/changelog.d/6028.misc b/changelog.d/6028.misc
deleted file mode 100644
index 85e81003ac..0000000000
--- a/changelog.d/6028.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix typo in account_treepid_delegates config.
-- 
cgit 1.5.1