From f70afbd565f34cdc093e083b92376a1154b007a7 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 16 Mar 2022 12:20:05 -0400
Subject: [PATCH] Re-generate changelog.

---
 CHANGES.md               | 1 +
 changelog.d/12234.bugfix | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 changelog.d/12234.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 60e7ecb1b..78498c10b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,7 @@ Bugfixes
 - Fix a bug introduced in Synapse 1.7.2 whereby background updates are never run with the default background batch size. ([\#12157](https://github.com/matrix-org/synapse/issues/12157))
 - Fix a bug where non-standard information was returned from the `/hierarchy` API. Introduced in Synapse v1.41.0. ([\#12175](https://github.com/matrix-org/synapse/issues/12175))
 - Fix a bug introduced in Synapse 1.54.0 that broke background updates on sqlite homeservers while search was disabled. ([\#12215](https://github.com/matrix-org/synapse/issues/12215))
+- Fix a long-standing bug when a `filter` argument with `event_fields` which did not include the `unsigned` field could result in a 500 error on `/sync`. ([\#12234](https://github.com/matrix-org/synapse/issues/12234))
 
 
 Improved Documentation
diff --git a/changelog.d/12234.bugfix b/changelog.d/12234.bugfix
deleted file mode 100644
index dbb77f36f..000000000
--- a/changelog.d/12234.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug when a `filter` argument with `event_fields` supplied but not including the `unsigned` field could result in a 500 error on `/sync`.