Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_events

2 files changed, 1 insertions, 1 deletions

diff --git a/changelog.d/6276.misc b/changelog.d/6276.misc
new file mode 100644

index 0000000000..4a4428251e
--- /dev/null
+++ b/changelog.d/6276.misc
@@ -0,0 +1 @@
+Add a CI job to test the `synapse_port_db` script.
diff --git a/changelog.d/6286.bugfix b/changelog.d/6286.bugfix
deleted file mode 100644

index a4bebec1c7..0000000000
--- a/changelog.d/6286.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where room directory search was case sensitive.