summary refs log tree commit diff
path: root/changelog.d/5769.feature
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-22 10:41:18 +0100
committerErik Johnston <erik@matrix.org>2019-10-22 10:41:18 +0100
commitbb6264be0b13314123b4fd047fe180616e8f0efa (patch)
treee06f393f38b4aea65101fbcdc0637e719b285727 /changelog.d/5769.feature
parentFix packaging (diff)
parentDelete format_tap.py (#6219) (diff)
downloadsynapse-bb6264be0b13314123b4fd047fe180616e8f0efa.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_stores
Diffstat (limited to 'changelog.d/5769.feature')
-rw-r--r--changelog.d/5769.feature1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/5769.feature b/changelog.d/5769.feature
new file mode 100644
index 0000000000..bf994ca327
--- /dev/null
+++ b/changelog.d/5769.feature
@@ -0,0 +1 @@
+Allow uploading of cross-signing keys.
\ No newline at end of file