summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-26 15:19:08 +0000
committerErik Johnston <erik@matrix.org>2014-11-26 15:19:08 +0000
commit5288a7dc9a1009f6063ac5b4da55090225176ded (patch)
tree6cc39e3b4c493edd49da0d2a9e40f99fda6243d7
parentMerge branch 'develop' of github.com:matrix-org/synapse (diff)
downloadsynapse-5288a7dc9a1009f6063ac5b4da55090225176ded.tar.xz
Bump version and changelog v0.5.2
Diffstat (limited to '')
-rw-r--r--CHANGES.rst5
-rw-r--r--VERSION2
-rw-r--r--synapse/__init__.py2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 3cd08938a2..5f1fa3a9d5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse 0.5.2 (2014-11-26)
+=====================================
+
+Fix major bug that caused rooms to disspear from peoples initial sync.
+
 Changes in synapse 0.5.1 (2014-11-26)
 =====================================
 See UPGRADES.rst for specific instructions on how to upgrade.
diff --git a/VERSION b/VERSION
index 4b9fcbec10..cb0c939a93 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.1
+0.5.2
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1c10c2074e..d5c2f25484 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.5.1"
+__version__ = "0.5.2"