summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-15 14:16:12 +0100
committerErik Johnston <erik@matrix.org>2015-06-15 14:16:12 +0100
commitcebde85b94692cfe062d74bb2c884dd097dc8bb4 (patch)
tree97599d7f663d6a727c470f240f2971ac9a9e42c9 /synapse/__init__.py
parentMerge pull request #183 from intelfx/install-python-schema-deltas (diff)
parentMerge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 (diff)
downloadsynapse-cebde85b94692cfe062d74bb2c884dd097dc8bb4.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-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 e6088dc6cc..b6ac0dab32 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.9.2"
+__version__ = "0.9.2-r1"