summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-05-01 18:53:56 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-05-01 18:53:56 +0100
commit2414178ed60faecc67180b233f56055b7e2c5b99 (patch)
tree464aa4e585784c2bf5b74765813e4ba09193e7b2 /synapse/__init__.py
parentMerge branch 'release-v0.28.1' into develop (diff)
parentfix conflict in changelog from previous release (diff)
downloadsynapse-2414178ed60faecc67180b233f56055b7e2c5b99.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 4924f44d4e..f31cb9a3cb 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.0"
+__version__ = "0.28.1"