diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-05-03 17:12:28 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-05-03 17:12:28 +0100 |
commit | e7dcee13da3ed85cebe8c3aaeb1e9b8f24a03acf (patch) | |
tree | 2cbdde6c7e262740c073a99064c39ca5363e60fd /synapse/handlers/room_member.py | |
parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
parent | Merge pull request #5134 from matrix-org/rav/url_preview_blacklist (diff) | |
download | synapse-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