summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-16 09:55:44 +0100
committerErik Johnston <erik@matrix.org>2015-09-16 09:55:44 +0100
commit0b1a55c60a7b10a987583dc2c231e8b1cfd29f30 (patch)
tree871c67ac5af8b6f8db44e6a04d7b033a039a8a94
parentMerge branch 'erikj/update_extremeties' into hotfixes-v0.10.0-r2 (diff)
downloadsynapse-0b1a55c60a7b10a987583dc2c231e8b1cfd29f30.tar.xz
Update changelog
-rw-r--r--CHANGES.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index cab5e495c3..f1d2c7a765 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,9 +1,11 @@
-Changes in synapse v0.10.0-r2 (2015-09-10)
+Changes in synapse v0.10.0-r2 (2015-09-16)
 ==========================================
 
 * Fix bug where we always fetched remote server signing keys instead of using
   ones in our cache.
 * Fix adding threepids to an existing account.
+* Fix bug with invinting over federation where remote server was already in
+  the room. (PR #281, SYN-392)
 
 Changes in synapse v0.10.0-r1 (2015-09-08)
 ==========================================