summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-12-13 17:57:08 +0000
committerErik Johnston <erik@matrix.org>2016-12-13 17:57:08 +0000
commit9d95351cad8173e0d2dd63a35996b93fa2048197 (patch)
treea2731299848af52f2f76b0e9e55971157ed68c71 /synapse
parentFix caching on public room list (diff)
parentUpdate changelog (diff)
downloadsynapse-9d95351cad8173e0d2dd63a35996b93fa2048197.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_list
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 f32c28be02..825e90a2da 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.5-rc2"
+__version__ = "0.18.5-rc3"