summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-11 13:16:11 +0100
committerErik Johnston <erik@matrix.org>2015-05-11 13:16:11 +0100
commite89ca34e0e23c46c8d72a0b03cf3f899f8d0fbb2 (patch)
treebe2ca2869db1599cee8aa43d6aa692c3fa9d5115 /synapse/__init__.py
parentMerge pull request #145 from matrix-org/hotfixes-v0.9.0-r3 (diff)
parentMerge pull request #146 from matrix-org/erikj/push_rules_fixes (diff)
downloadsynapse-e89ca34e0e23c46c8d72a0b03cf3f899f8d0fbb2.tar.xz
Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse v0.9.0-r4
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 705ea581df..041e2151b0 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.0-r3"
+__version__ = "0.9.0-r4"