summary refs log tree commit diff
path: root/synapse/handlers/room_member.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-03 17:12:28 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-03 17:12:28 +0100
commite7dcee13da3ed85cebe8c3aaeb1e9b8f24a03acf (patch)
tree2cbdde6c7e262740c073a99064c39ca5363e60fd /synapse/handlers/room_member.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #5134 from matrix-org/rav/url_preview_blacklist (diff)
downloadsynapse-e7dcee13da3ed85cebe8c3aaeb1e9b8f24a03acf.tar.xz
Merge commit 'a845abbf3' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/room_member.py')
0 files changed, 0 insertions, 0 deletions