diff options
author | Erik Johnston <erik@matrix.org> | 2016-12-13 17:57:08 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-12-13 17:57:08 +0000 |
commit | 9d95351cad8173e0d2dd63a35996b93fa2048197 (patch) | |
tree | a2731299848af52f2f76b0e9e55971157ed68c71 /synapse | |
parent | Fix caching on public room list (diff) | |
parent | Update changelog (diff) | |
download | synapse-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__.py | 2 |
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" |