summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-16 11:05:34 +0100
committerErik Johnston <erik@matrix.org>2015-09-16 11:05:34 +0100
commiteb700cdc3886b5a31699fce25e9471c56b946b9d (patch)
treeca642b54b7e2c0cf1c85eb709b3052fc11ef7842 /CHANGES.rst
parentMerge pull request #281 from matrix-org/erikj/update_extremeties (diff)
parentMerge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse (diff)
downloadsynapse-eb700cdc3886b5a31699fce25e9471c56b946b9d.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
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)
 ==========================================