Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 12 Oct 2019 14:42:55 +0000 (14:42 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 12 Oct 2019 14:43:20 +0000 (14:43 +0000)
commita8afbe977a85580f23598a9928525b33fe7fd3fd
tree29d9d3012aac0a7f82f3983760757b02fdd79143
parentd9410c488a85bc8da87c1b662ed0a8ffac4d6466
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
lib/pleroma/reverse_proxy/reverse_proxy.ex