summary refs log tree commit diff
path: root/synapse/rest/media/v1/config_resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-06-26 11:08:10 +0100
committerErik Johnston <erik@matrix.org>2020-06-26 11:08:10 +0100
commit199ab854d6a2f9aa87b59606875844376a138f95 (patch)
tree7fcde36baf5ff170cf4762b97578c6da3fe0d380 /synapse/rest/media/v1/config_resource.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentAdd another yield point to state res v2 (#7746) (diff)
downloadsynapse-199ab854d6a2f9aa87b59606875844376a138f95.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/media/v1/config_resource.py')
0 files changed, 0 insertions, 0 deletions