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:42:55 +0000 (14:42 +0000)
commit930cbd6d05653033e9f6d16960d698f5db4ae624
treec829b1809f8d574d6007a89e531fce3fdb603262
parent44afe4c8870d14ae2cd22ff5cfa04555cf5907bd
parent9bdbf0811b362d8eb9d2456e9c87c9dde1b35d9b
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'

Make MediaProxy failure tracking less brutal

See merge request pleroma/pleroma!1836