From 24652fbdf1a4a908b2b87812cd3e29e69617cd1b Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 3 Aug 2020 18:44:01 -0700
Subject: [PATCH] Changelog

---
 changelog.d/53.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/53.feature

diff --git a/changelog.d/53.feature b/changelog.d/53.feature
new file mode 100644
index 0000000000..96c628e824
--- /dev/null
+++ b/changelog.d/53.feature
@@ -0,0 +1 @@
+Merge mainline Synapse v1.18.0 into the `dinsic` branch.
\ No newline at end of file