summary refs log tree commit diff
path: root/synapse/handlers/room_member.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-09 14:51:17 +0000
committerErik Johnston <erik@matrix.org>2017-01-09 14:51:17 +0000
commit9898bbd9dc60653cd0186460c0014505195ed874 (patch)
treeaf4ffd4da02bc3c917537b4882010d776f9c6b5d /synapse/handlers/room_member.py
parentgah, fix mangled merge of 0.18.7 into develop (diff)
parentBump version and changelog (diff)
downloadsynapse-9898bbd9dc60653cd0186460c0014505195ed874.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/room_member.py')
0 files changed, 0 insertions, 0 deletions