summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-25 15:09:46 +0100
committerErik Johnston <erik@matrix.org>2016-10-25 15:09:46 +0100
commit22fbf86e4f40d359b1f34f94139ac7c1959e1611 (patch)
tree473524275cf0c1852ef2e8ebe8fe581c0777b7a9 /synapse/__init__.py
parentMerge pull request #1179 from matrix-org/erikj/typing_timer_paranoia (diff)
parentFixup change log (diff)
downloadsynapse-22fbf86e4f40d359b1f34f94139ac7c1959e1611.tar.xz
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop
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 6333c1119e..fdffbfe815 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.18.2-rc1"
+__version__ = "0.18.2-rc2"