From f931c0602a1dcfd40696c53779d80dc68c9c9e17 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <erice@element.io>
Date: Wed, 6 Apr 2022 13:41:15 -0500
Subject: [PATCH] Update changelog to describe changes from #12370 relative to
 `develop` (#12401)

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

diff --git a/changelog.d/12370.bugfix b/changelog.d/12370.bugfix
deleted file mode 100644
index 97dca97829..0000000000
--- a/changelog.d/12370.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix `/messages` returning backfilled and [MSC2716](https://github.com/matrix-org/synapse/pull/12319) historic messages our of order.
diff --git a/changelog.d/12370.feature b/changelog.d/12370.feature
new file mode 100644
index 0000000000..2c695ddaa0
--- /dev/null
+++ b/changelog.d/12370.feature
@@ -0,0 +1 @@
+Update `/messages` to use historic pagination tokens if no `from` query parameter is given.