summary refs log tree commit diff
path: root/synapse/rest/media/v1/upload_resource.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-07-01 10:46:06 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-07-01 10:46:06 +0100
commitba66e3dfefc18b7b7a52ec7c9bdb25e5dd868f39 (patch)
tree6235dde2fae480e07d5c81b3a2fe8f8bbb8be4a6 /synapse/rest/media/v1/upload_resource.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentAdditional configuration options for auto-join rooms (#7763) (diff)
downloadsynapse-ba66e3dfefc18b7b7a52ec7c9bdb25e5dd868f39.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/media/v1/upload_resource.py')
0 files changed, 0 insertions, 0 deletions