summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-17 10:13:16 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-17 10:13:16 +0100
commit425e6b4983ccb01bf9053edb14ff23a7eb9a0afb (patch)
tree7bdebcc130261183a7d3864f56857e7006df3454 /scripts-dev
parentRemove get_joined_rooms_for_user from RoomMemberHandler (diff)
parentMerge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff)
downloadsynapse-425e6b4983ccb01bf9053edb14ff23a7eb9a0afb.tar.xz
Merge branch 'develop' into markjh/member_cleanup
Diffstat (limited to 'scripts-dev')
0 files changed, 0 insertions, 0 deletions