Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Sat, 12 Oct 2019 14:54:49 +0000 (14:54 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 12 Oct 2019 14:54:49 +0000 (14:54 +0000)
commit1f99abbeba88f852e02ac784d0ce7309785f3387
tree29d9d3012aac0a7f82f3983760757b02fdd79143
parentd9410c488a85bc8da87c1b662ed0a8ffac4d6466
parenta8afbe977a85580f23598a9928525b33fe7fd3fd
Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'

Backport mediaproxy failure tracking enchancements to maint

See merge request pleroma/pleroma!1837