summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-08 16:46:56 +0100
committerErik Johnston <erik@matrix.org>2015-04-08 16:46:56 +0100
commita43b40449b5257cec4e2e740c2f90728be84b695 (patch)
tree805220033f1fcc25dbf88e0356ee3f90ec7a3970 /synapse/__init__.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into mysql (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-a43b40449b5257cec4e2e740c2f90728be84b695.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
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 749a60329c..fd87c7e2d0 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-r2"
+__version__ = "0.8.1-r3"