summary refs log tree commit diff
path: root/changelog.d/3634.misc
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-09 11:40:37 +0100
committerNeil Johnson <neil@matrix.org>2018-08-09 11:40:37 +0100
commita5ef1107490a8f581e8baf8a29d509826b8d2490 (patch)
tree24dcb2ae7813a421d04b6faa3a00c8ec646a7bef /changelog.d/3634.misc
parentsync auth blocking (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-a5ef1107490a8f581e8baf8a29d509826b8d2490.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block
Diffstat (limited to 'changelog.d/3634.misc')
-rw-r--r--changelog.d/3634.misc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/3634.misc b/changelog.d/3634.misc
deleted file mode 100644
index 2cd6af91ff..0000000000
--- a/changelog.d/3634.misc
+++ /dev/null
@@ -1 +0,0 @@
-rename replication_layer to federation_client