summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-20 16:40:55 +0000
committerErik Johnston <erik@matrix.org>2015-11-20 16:40:55 +0000
commit7680ae16c9380b65cc6d6dfe192fa2775ce5a5d3 (patch)
tree887f934b9883e9e4bfee8c438718c517a569c907
parentBump changes and version (diff)
downloadsynapse-7680ae16c9380b65cc6d6dfe192fa2775ce5a5d3.tar.xz
Fix english
Diffstat (limited to '')
-rw-r--r--CHANGES.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 4ffffacab0..5c38c1915f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,8 +3,8 @@ Changes in synapse v0.11.1 (2015-11-20)
 
 * Add extra options to search API (PR #394)
 * Fix bug where we did not correctly cap federation retry timers. This meant it
-  hours for servers to start talking to ressurected servers, even when they
-  were receiving traffic from them (PR #393)
+  could take several hours for servers to start talking to ressurected servers,
+  even when they were receiving traffic from them (PR #393)
 * Don't advertise login token flow unless CAS is enabled. This caused issues
   where some clients would always use the fallback API if they did not
   recognize all login flows (PR #391)