summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-19 11:40:32 +0000
committerErik Johnston <erik@matrix.org>2018-03-19 11:41:01 +0000
commitfa728034900ae63d8132962008319d37df3993db (patch)
tree9ed8d7230c116bc28057f11395a795d3f993880c /synapse/__init__.py
parentspell out not to massively increase bcrypt rounds (diff)
parentMerge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-fa728034900ae63d8132962008319d37df3993db.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse 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 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"