diff options
author | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:08:07 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2020-07-02 10:08:07 -0400 |
commit | bd30967bd7f3cc9eca7e018dfae34f4f7cb1cf35 (patch) | |
tree | 6c23b3eba70493c05562f18001be4f7be8d3d86d /synapse/rest/media/v1/upload_resource.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Correctly handle outliers as prev events over federation (diff) | |
download | synapse-bd30967bd7f3cc9eca7e018dfae34f4f7cb1cf35.tar.xz |
Merge branch 'release-v1.15.2' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/media/v1/upload_resource.py')
0 files changed, 0 insertions, 0 deletions