summary refs log tree commit diff
path: root/synapse/rest/admin/media.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-11-30 11:48:06 +0000
committerBrendan Abolivier <babolivier@matrix.org>2021-11-30 11:48:06 +0000
commite713855dca17a7605bae99ea8d71bc7f8657e4b8 (patch)
tree723f79596374042e349d55a6195cbe2b5eea29eb /synapse/rest/admin/media.py
parentMove notices up (diff)
downloadsynapse-e713855dca17a7605bae99ea8d71bc7f8657e4b8.tar.xz
Merge trust_identity_server_for_password_resets PRs v1.48.0
Diffstat (limited to 'synapse/rest/admin/media.py')
0 files changed, 0 insertions, 0 deletions