From: rinpatch <rinpatch@sdf.org>
Date: Sat, 12 Oct 2019 14:54:49 +0000 (+0000)
Subject: Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1f99abbeba88f852e02ac784d0ce7309785f3387;hp=--cc;p=akkoma

Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'

Backport mediaproxy failure tracking enchancements to maint

See merge request pleroma/pleroma!1837
---

1f99abbeba88f852e02ac784d0ce7309785f3387