Merge branch 'master' of github.com:matrix-org/synapse into develop

9 years ago · eb700cdc38
parent 2048388cfd 16026e60c5
commit eb700cdc38
2 changed files with 10 additions and 1 deletions
--- 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)
 ==========================================

--- a/synapse/init.py
+++ b/synapse/init.py
@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """

-__version__ = "0.10.0-r1"
+__version__ = "0.10.0-r2"