summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-05-18 13:55:19 +0100
committerNeil Johnson <neil@matrix.org>2018-05-18 13:55:19 +0100
commitf3d9dca9759ae1fc66f2840ed5c4d229c14adcdc (patch)
tree21f59a7002f20e741c3ec342c6531dcc8ece1460
parentlight grammar changes (diff)
parentbump version, change log (diff)
downloadsynapse-f3d9dca9759ae1fc66f2840ed5c4d229c14adcdc.tar.xz
Merge branch 'release-v0.29.0' of https://github.com/matrix-org/synapse into release-v0.29.0 v0.29.1 github/release-v0.29.0 release-v0.29.0
Diffstat (limited to '')
-rw-r--r--CHANGES.rst8
-rw-r--r--synapse/__init__.py2
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index b769b0f046..851cb9b2d7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,12 @@
+Changes in synapse v0.29.1 (2018-05-17)
+==========================================
+Changes:
+
+* Update docker documentation (PR #3222)
+
 Changes in synapse v0.29.0 (2018-05-16)
 ===========================================
-
+Not changes since v0.29.0-rc1
 
 Changes in synapse v0.29.0-rc1 (2018-05-14)
 ===========================================
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d94c20505e..b11a1d3ea3 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.29.0"
+__version__ = "0.29.1"