summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-05-16 16:48:10 +0100
committerNeil Johnson <neil@matrix.org>2018-05-16 16:48:10 +0100
commit85b8acdeb44520bd5ec2d08545a5e5e2862310d1 (patch)
treec5ee65b943ea47501184021150ee08b3de3e6427 /synapse
parentMerge pull request #3163 from matrix-org/cohort_analytics (diff)
parentbump version and changelog for 0.29.0 (diff)
downloadsynapse-85b8acdeb44520bd5ec2d08545a5e5e2862310d1.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f31cb9a3cb..d94c20505e 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.28.1"
+__version__ = "0.29.0"