summary refs log tree commit diff
path: root/synapse/rest/media
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-07-02 11:56:17 +0100
committerRichard van der Hoff <richard@matrix.org>2019-07-02 11:56:17 +0100
commit7085e8c0fb4b864f9b0ab205fee52e61d1c906be (patch)
treee3af4975e5b6b1e5784479ace008c3b89168333d /synapse/rest/media
parentprepare v1.1.0rc1 (diff)
parentMerge pull request #5552 from matrix-org/rav/github_templates (diff)
downloadsynapse-7085e8c0fb4b864f9b0ab205fee52e61d1c906be.tar.xz
Merge remote-tracking branch 'origin/master' into release-v1.1.0
Diffstat (limited to 'synapse/rest/media')
0 files changed, 0 insertions, 0 deletions