summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-05-18 14:07:50 +0100
committerNeil Johnson <neil@matrix.org>2018-05-18 14:07:50 +0100
commit2725223f0818396665b49463c4d65c68e969c8fa (patch)
treeb2793e28392774fe7386d1a2ff8781b336af258e /synapse/__init__.py
parentMerge pull request #3232 from matrix-org/rav/server_notices_room (diff)
parentMerge tag 'v0.29.1' (diff)
downloadsynapse-2725223f0818396665b49463c4d65c68e969c8fa.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
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"