summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-13 11:43:29 +0000
committerErik Johnston <erik@matrix.org>2015-11-13 11:43:29 +0000
commit0644f0eb7db5415480d52591100596b0eebc8327 (patch)
tree6a77516cbcf18b4f058995bbc544ff469fee9727
parentMerge branch 'develop' into release-v0.11.0 (diff)
downloadsynapse-0644f0eb7db5415480d52591100596b0eebc8327.tar.xz
Bump version and change log v0.11.0-rc2
-rw-r--r--CHANGES.rst8
-rw-r--r--synapse/__init__.py2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index cf5e33c4f9..f06fefa80e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse v0.11.0-rc2 (2015-11-13)
+===========================================
+
+* Various changes to /sync API response format (PR #373)
+* Fix regression when setting display name in newly joined room over
+  federation (PR #368)
+* Fix problem where /search was slow when using SQLite (PR #366)
+
 Changes in synapse v0.11.0-rc1 (2015-11-11)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f68a15bb85..df4c36c02e 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.11.0-rc1"
+__version__ = "0.11.0-rc2"