summary refs log tree commit diff
path: root/changelog.d/3501.misc
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-27 09:17:11 +0100
committerGitHub <noreply@github.com>2018-07-27 09:17:11 +0100
commit7041cd872b8f1105d58f8e8ac79ffd32c76a1994 (patch)
tree4736db867cfd029d8e7627edb971eccc926371bc /changelog.d/3501.misc
parentMerge remote-tracking branch 'upstream/develop' into send_sni_for_federation_... (diff)
parentMerge pull request #3616 from matrix-org/travis/event_id_send_leave (diff)
downloadsynapse-7041cd872b8f1105d58f8e8ac79ffd32c76a1994.tar.xz
Merge branch 'develop' into send_sni_for_federation_requests
Diffstat (limited to 'changelog.d/3501.misc')
-rw-r--r--changelog.d/3501.misc0
1 files changed, 0 insertions, 0 deletions
diff --git a/changelog.d/3501.misc b/changelog.d/3501.misc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/changelog.d/3501.misc
+++ /dev/null