summary refs log tree commit diff
path: root/synapse/rest/media/v1/thumbnail_resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-03-04 10:23:26 +0000
committerErik Johnston <erik@matrix.org>2021-03-04 10:23:26 +0000
commit61a970e25fc5e6dc1036b1bb4702ef8e6e44f419 (patch)
tree16fd89ce0b5b0efa51d29c61723401ee6429beb6 /synapse/rest/media/v1/thumbnail_resource.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parent 1.29.0rc1 (diff)
downloadsynapse-61a970e25fc5e6dc1036b1bb4702ef8e6e44f419.tar.xz
Merge remote-tracking branch 'origin/release-v1.29.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/media/v1/thumbnail_resource.py')
0 files changed, 0 insertions, 0 deletions