diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-12-29 16:18:04 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-12-29 16:18:04 +0000 |
commit | f023be9293d7fb8a95f55304579e15681efc5128 (patch) | |
tree | a49249cc44d0f82a4b03cfc447a9b8987197237a | |
parent | Merge pull request #1725 from matrix-org/erikj/timeout_conn (diff) | |
download | synapse-f023be9293d7fb8a95f55304579e15681efc5128.tar.xz |
Bump changelog and version v0.18.6-rc1
-rw-r--r-- | CHANGES.rst | 7 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst |