summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-16 09:56:15 +0100
committerErik Johnston <erik@matrix.org>2015-09-16 09:56:15 +0100
commit16026e60c5381abcfea12f55b57f8d0ce474c402 (patch)
tree871c67ac5af8b6f8db44e6a04d7b033a039a8a94 /CHANGES.rst
parentBump version/changelog (diff)
parentUpdate changelog (diff)
downloadsynapse-16026e60c5381abcfea12f55b57f8d0ce474c402.tar.xz
Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse v0.10.0-r2
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index a0a12ca4a0..f1d2c7a765 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+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)
 ==========================================