diff options
author | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
commit | 6f52e90065243682d93e5f89b071e1fb056fa6ab (patch) | |
tree | 98b9c43dd42dbc3d14a96f1b81e0631c7ac271c9 /README.rst | |
parent | Unused import (diff) | |
parent | Merge pull request #553 from matrix-org/daniel/accesstokenlogging (diff) | |
download | synapse-6f52e90065243682d93e5f89b071e1fb056fa6ab.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions