summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-12 11:19:37 +0000
committerErik Johnston <erik@matrix.org>2016-02-12 11:19:37 +0000
commitec0f3836ff8ac88019d9e83bea0995989ff53c00 (patch)
tree759fcffe94a168a21e4461418165e35914adcd22
parentMerge pull request #572 from matrix-org/daniel/exclusivity (diff)
parentMerge branch 'release-v0.13.3' of github.com:matrix-org/synapse (diff)
downloadsynapse-ec0f3836ff8ac88019d9e83bea0995989ff53c00.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r--CHANGES.rst11
-rw-r--r--synapse/__init__.py2
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 199fb1384c..bebf489e21 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+Changes in synapse v0.13.3 (2016-02-11)
+=======================================
+
+* Fix bug where ``/sync`` would occasionally return events in the wrong room.
+
+Changes in synapse v0.13.2 (2016-02-11)
+=======================================
+
+* Fix bug where ``/events`` would fail to skip some events if there had been
+  more events than the limit specified since the last request (PR #570)
+
 Changes in synapse v0.13.1 (2016-02-10)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 8da62c7b07..bc50bec9db 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.13.1"
+__version__ = "0.13.3"