diff options
author | rinpatch <rinpatch@sdf.org> | 2019-10-12 14:42:55 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-10-12 14:43:20 +0000 |
commit | a8afbe977a85580f23598a9928525b33fe7fd3fd (patch) | |
tree | 29d9d3012aac0a7f82f3983760757b02fdd79143 /rel | |
parent | d9410c488a85bc8da87c1b662ed0a8ffac4d6466 (diff) | |
download | pleroma-a8afbe977a85580f23598a9928525b33fe7fd3fd.tar.gz |
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
(cherry picked from commit 930cbd6d05653033e9f6d16960d698f5db4ae624)
9bdbf081 Make MediaProxy failure tracking less brutal
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions