From: kaniini <nenolod@gmail.com>
Date: Fri, 28 Jun 2019 23:50:23 +0000 (+0000)
Subject: Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f375c2fd700d09da8de831b955731acbb604cf79;p=akkoma

Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'

MRF: add mediaproxy warming policy

See merge request pleroma/pleroma!1342
---

f375c2fd700d09da8de831b955731acbb604cf79