summary refs log tree commit diff
path: root/changelog.d/6017.misc
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-06-10 11:42:30 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-06-10 11:42:30 +0100
commitec0a7b9034806d6b2ba086bae58f5c6b0fd14672 (patch)
treef2af547b1342795e10548f8fb7a9cfc93e03df37 /changelog.d/6017.misc
parentchangelog (diff)
parent1.15.0rc1 (diff)
downloadsynapse-ec0a7b9034806d6b2ba086bae58f5c6b0fd14672.tar.xz
Merge branch 'develop' into babolivier/mark_unread
Diffstat (limited to 'changelog.d/6017.misc')
-rw-r--r--changelog.d/6017.misc1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/6017.misc b/changelog.d/6017.misc
deleted file mode 100644
index 5ccab9c6ca..0000000000
--- a/changelog.d/6017.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some code in the retry logic.