summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-17 16:08:28 +0100
committerErik Johnston <erik@matrix.org>2015-04-17 16:08:28 +0100
commit4a5990ff8fba3c00851bb601a2482152fc4bb57f (patch)
treeca5b548faf1a3044c82f344d5601ea05fe718a07 /synapse
parentAdd kick users script (diff)
parentMerge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 (diff)
downloadsynapse-4a5990ff8fba3c00851bb601a2482152fc4bb57f.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
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 fd87c7e2d0..56c10a84e9 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.8.1-r3"
+__version__ = "0.8.1-r4"