From 0b1a55c60a7b10a987583dc2c231e8b1cfd29f30 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 16 Sep 2015 09:55:44 +0100
Subject: [PATCH] Update changelog

---
 CHANGES.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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)
 ==========================================
-- 
GitLab