summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-11-19 17:21:03 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-11-19 17:21:03 +0000
commitdd11bf8a795ed9c20ce694cd0cd12cf47c00fd25 (patch)
treef1647aaf46015d8da38d7ed1c6192cc835f13192 /CHANGES.rst
parentPut back the 'state.events' subobject (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-dd11bf8a795ed9c20ce694cd0cd12cf47c00fd25.tar.xz
Merge branch 'develop' into rav/flatten_sync_response
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 5bea8e82d5..d01eca4004 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse v0.11.0-r2 (2015-11-19)
+==========================================
+
+* Fix bug in database port script (PR #387)
+
 Changes in synapse v0.11.0-r1 (2015-11-18)
 ==========================================