summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-05 18:39:50 +0000
committerDavid Baker <dave@matrix.org>2016-01-05 18:39:50 +0000
commiteb036256267dc76f13a8a25ab952356e1b1e9c00 (patch)
tree6d91ca8882e7afc8c5486e28d2e782783b1c85de /synapse/__init__.py
parentcomment typo (diff)
parentMerge pull request #463 from matrix-org/daniel/hashtagnofilter (diff)
downloadsynapse-eb036256267dc76f13a8a25ab952356e1b1e9c00.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 d1ce6b982d..5db4eae354 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-rc3"
+__version__ = "0.12.0"