summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-26 15:51:39 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-26 15:51:39 +0100
commit28dd536e80167677ce45bd8eeee95c6ff6eff66f (patch)
tree009b391f594c1b23cb2b267d6cd77a40c32b0be7
parentMerge branch 'develop' of https://github.com/matrix-org/synapse into release-... (diff)
downloadsynapse-28dd536e80167677ce45bd8eeee95c6ff6eff66f.tar.xz
update changelog and bump version to 0.28.0 v0.28.0 github/release-v0.28.0-rc1 release-v0.28.0-rc1
-rw-r--r--CHANGES.rst9
-rw-r--r--synapse/__init__.py2
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index b7da58edbb..74f454cb5b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+Changes in synapse v0.28.0-rc1 (2018-04-26)
+===========================================
+
+Bug Fixes:
+
+* Fix quarantine media admin API and search reindex (PR #3130)
+* Fix media admin APIs (PR #3134)
+
+
 Changes in synapse v0.28.0-rc1 (2018-04-24)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 2b2c440eb8..4924f44d4e 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-rc1"
+__version__ = "0.28.0"