summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-12-14 16:26:59 +0000
committerMark Haines <mjark@negativecurvature.net>2015-12-14 16:26:59 +0000
commit63fdd9fe0bc5ed3aabe27af7e082d697e4863c83 (patch)
tree1c5bad28a99f368a47ba26ccb20efb5c85c9dbe7 /synapse
parentMerge pull request #444 from matrix-org/markjh/presence_race (diff)
downloadsynapse-63fdd9fe0bc5ed3aabe27af7e082d697e4863c83.tar.xz
Changelog and version bump for v0.12.0-rc2 v0.12.0-rc2
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 c357f8f9c2..e07c26ccd0 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-rc1"
+__version__ = "0.12.0-rc2"