summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-01-05 10:54:01 +0000
committerErik Johnston <erik@matrix.org>2018-01-05 10:54:01 +0000
commit864a6d297767dd6b91e66a64f74d1ddefcd10ef1 (patch)
treeb54ee51ca248fd45dbbd06050d97a6cd6a2cc4a5
parentFix rc version number (diff)
downloadsynapse-864a6d297767dd6b91e66a64f74d1ddefcd10ef1.tar.xz
Bump version and changelog release-v0.26.0
-rw-r--r--CHANGES.rst6
-rw-r--r--synapse/__init__.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 77b65ebe04..dcf9adc95c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in synapse v0.26.0 (2018-01-05)
+=======================================
+
+No changes since v0.26.0-rc1
+
+
 Changes in synapse v0.26.0-rc1 (2017-12-13)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index fb2a88a3f1..ef8853bd24 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.0-rc1"
+__version__ = "0.26.0"