summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorkaiyou <pierre@jaury.eu>2018-03-17 16:02:08 +0100
committerkaiyou <pierre@jaury.eu>2018-03-17 16:02:08 +0100
commit757f1b58437f912e147f523ea55d45dfda8a8c1e (patch)
tree034e210d3df7ef63c43ba0d5a35231ba398fedca /synapse/__init__.py
parentDisable logging to file and rely on the console when using Docker (diff)
parentMerge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-757f1b58437f912e147f523ea55d45dfda8a8c1e.tar.xz
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
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 ef8853bd24..80efad3a65 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"
+__version__ = "0.26.1"