From ab3130ecafcfb8f5007957dc31f03ca71906cf5e Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Thu, 14 May 2020 12:06:59 +0100
Subject: [PATCH] Add changelog

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

diff --git a/changelog.d/39.feature b/changelog.d/39.feature
new file mode 100644
index 0000000000..426b7ef27e
--- /dev/null
+++ b/changelog.d/39.feature
@@ -0,0 +1 @@
+Merge Synapse v1.12.4 `master` into the `dinsic` branch.
\ No newline at end of file