diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-15 16:48:16 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-15 16:48:16 +0100 |
commit | 40c020ad1332dc3f0a3a87cdb0966fab79efdc7b (patch) | |
tree | a42c8da07a019c2d3f2fbf95a1f9be42f5dc81ff /synapse/http | |
parent | Rename method name to not clash with other ones in storage. (diff) | |
parent | Also include users' presence when responding to /rooms/:room_id/members/list (diff) | |
download | synapse-40c020ad1332dc3f0a3a87cdb0966fab79efdc7b.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'synapse/http')
0 files changed, 0 insertions, 0 deletions