summary refs log tree commit diff
path: root/synapse/handlers/room_member.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-01-22 13:16:51 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-01-22 13:16:51 +0000
commit117bc94cd2797600dee572b854d298b4e8fbedc2 (patch)
tree28fb43311c766146ea3ea69c087b7837f79b993b /synapse/handlers/room_member.py
parentPrevent duplicate room IDs in m.direct (diff)
parentMake key fetches use regular federation client (#4426) (diff)
downloadsynapse-117bc94cd2797600dee572b854d298b4e8fbedc2.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upgrade
Diffstat (limited to 'synapse/handlers/room_member.py')
0 files changed, 0 insertions, 0 deletions