1 files changed, 1 insertions, 0 deletions

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