summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-23 16:57:41 +0000
committerErik Johnston <erik@matrix.org>2016-03-23 16:57:41 +0000
commit15844040c236fd3b7199286533239051c9a9b7ea (patch)
tree2e7eacfb14d787f63047fbffc87066a74cb67206 /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0 (diff)
downloadsynapse-15844040c236fd3b7199286533239051c9a9b7ea.tar.xz
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 67fbc3a33a..60a7e8d69c 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.14.0-rc1" +__version__ = "0.14.0-rc2"