summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/5726.feature1
-rw-r--r--changelog.d/6229.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/5726.feature b/changelog.d/5726.feature
new file mode 100644
index 0000000000..d3c669aec0
--- /dev/null
+++ b/changelog.d/5726.feature
@@ -0,0 +1 @@
+Add ability to upload cross-signing signatures.
diff --git a/changelog.d/6229.bugfix b/changelog.d/6229.bugfix
new file mode 100644
index 0000000000..bced3304d0
--- /dev/null
+++ b/changelog.d/6229.bugfix
@@ -0,0 +1 @@
+Prevent the demo Synapse's from blacklisting `::1`.
\ No newline at end of file