summary refs log tree commit diff
path: root/changelog.d/4428.misc
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-30 10:56:47 +0000
committerNeil Johnson <neil@matrix.org>2019-01-30 10:56:47 +0000
commitb37e8c9572ef90367bef9e70b66150fdfe243e5d (patch)
tree1207a22a9529d48603317826926bc02866a474a0 /changelog.d/4428.misc
parentisort (diff)
parentMerge branch 'develop' into neilj/room_capabilities (diff)
downloadsynapse-b37e8c9572ef90367bef9e70b66150fdfe243e5d.tar.xz
Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into neilj/room_capabilities
Diffstat (limited to 'changelog.d/4428.misc')
-rw-r--r--changelog.d/4428.misc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/4428.misc b/changelog.d/4428.misc
deleted file mode 100644
index 9a51434755..0000000000
--- a/changelog.d/4428.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move SRV logic into the Agent layer