summary refs log tree commit diff
path: root/changelog.d/50.feature
diff options
context:
space:
mode:
Diffstat (limited to 'changelog.d/50.feature')
-rw-r--r--changelog.d/50.feature1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/50.feature b/changelog.d/50.feature
new file mode 100644
index 0000000000..0801622c8a
--- /dev/null
+++ b/changelog.d/50.feature
@@ -0,0 +1 @@
+Merge Synapse mainline v1.15.1 into the `dinsic` branch.
\ No newline at end of file