summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-12-13 11:23:08 +0000
committerErik Johnston <erik@matrix.org>2016-12-13 11:23:08 +0000
commitbae1115e55056f50125c74a45ca83af688334ef6 (patch)
tree85edc9287c0eccdf5f0f1289404d411f0e633573
parentBump changelog and version (diff)
downloadsynapse-bae1115e55056f50125c74a45ca83af688334ef6.tar.xz
Diffstat (limited to '')
-rw-r--r--CHANGES.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index d245ec51fe..414732ac28 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,7 +14,6 @@ Changes:
 * Limit the number of events that can be created on a given room concurrently
   (PR #1620)
 * Log the args that we have on UI auth completion (PR #1649)
-* Correctly handle 500's and 429 on federation (PR #1650)
 * Stop generating refresh_tokens (PR #1654)
 * Stop putting a time caveat on access tokens (PR #1656)
 * Remove unspecced GET endpoints for e2e keys (PR #1694)
@@ -22,6 +21,7 @@ Changes:
 
 Bug fixes:
 
+* Fix handling of 500 and 429's over federation (PR #1650)
 * Fix Content-Type header parsing (PR #1660)
 * Fix error when previewing sites that include unicode, thanks to kyrias (PR
   #1664)