summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-15 14:39:46 +0100
committerErik Johnston <erik@matrix.org>2015-06-15 14:39:46 +0100
commit6a7cf6b41fe6c6356729390a01918d3deb134eab (patch)
treed3f16593aea2d6871365cc24bcc09fd048885920 /synapse
parentMerge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 (diff)
parentChangelog (diff)
downloadsynapse-6a7cf6b41fe6c6356729390a01918d3deb134eab.tar.xz
Merge pull request #186 from matrix-org/hotfixes-v0.9.2-r2 v0.9.2-r2
Hotfixes v0.9.2-r2
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index b6ac0dab32..d111335a1a 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-r1"
+__version__ = "0.9.2-r2"