summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-16 09:56:15 +0100
committerErik Johnston <erik@matrix.org>2015-09-16 09:56:15 +0100
commit16026e60c5381abcfea12f55b57f8d0ce474c402 (patch)
tree871c67ac5af8b6f8db44e6a04d7b033a039a8a94 /synapse/__init__.py
parentBump version/changelog (diff)
parentUpdate changelog (diff)
downloadsynapse-16026e60c5381abcfea12f55b57f8d0ce474c402.tar.xz
Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse v0.10.0-r2
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 5b5ff6c3f3..d62294e6bb 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.10.0-r1"
+__version__ = "0.10.0-r2"