diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-05-17 10:13:16 +0100 |
commit | 425e6b4983ccb01bf9053edb14ff23a7eb9a0afb (patch) | |
tree | 7bdebcc130261183a7d3864f56857e7006df3454 /synapse/handlers/room.py | |
parent | Remove get_joined_rooms_for_user from RoomMemberHandler (diff) | |
parent | Merge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff) | |
download | synapse-425e6b4983ccb01bf9053edb14ff23a7eb9a0afb.tar.xz |
Merge branch 'develop' into markjh/member_cleanup
Diffstat (limited to 'synapse/handlers/room.py')
0 files changed, 0 insertions, 0 deletions