projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9410c4 a8afbe9)
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)
Backport mediaproxy failure tracking enchancements to maint

See merge request pleroma/pleroma!1837


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git