summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-04 13:39:51 +0000
committerDavid Baker <dave@matrix.org>2016-01-04 13:39:51 +0000
commit928c575c6f0920810751957dcf0a7bfdd5d855f2 (patch)
tree05addd9237604902e9450f5e3583fd9cbe268276 /synapse/__init__.py
parentAddress minor PR issues (diff)
parentUpdate CHANGES (diff)
downloadsynapse-928c575c6f0920810751957dcf0a7bfdd5d855f2.tar.xz
Merge remote-tracking branch 'origin/develop' into store_event_actions
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 e07c26ccd0..d1ce6b982d 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.12.0-rc2"
+__version__ = "0.12.0-rc3"