summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-22 10:19:53 +0000
committerErik Johnston <erik@matrix.org>2018-03-22 10:19:53 +0000
commiteb9fc021e302aa7a5c39902e056cc525328431f8 (patch)
tree9162c92d399494be5213ec24c6e547c42f40469a /synapse
parentMerge pull request #3015 from matrix-org/erikj/simplejson_replication (diff)
parentUpdate CHANGES.rst (diff)
downloadsynapse-eb9fc021e302aa7a5c39902e056cc525328431f8.tar.xz
Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse 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 80efad3a65..71b409ba8b 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.26.1"
+__version__ = "0.27.0-rc2"