summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-15 16:48:16 +0100
committerErik Johnston <erik@matrix.org>2014-08-15 16:48:16 +0100
commit40c020ad1332dc3f0a3a87cdb0966fab79efdc7b (patch)
treea42c8da07a019c2d3f2fbf95a1f9be42f5dc81ff /.gitignore
parentRename method name to not clash with other ones in storage. (diff)
parentAlso include users' presence when responding to /rooms/:room_id/members/list (diff)
downloadsynapse-40c020ad1332dc3f0a3a87cdb0966fab79efdc7b.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions