Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 28 Jun 2019 23:50:23 +0000 (23:50 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 28 Jun 2019 23:50:23 +0000 (23:50 +0000)
commitf375c2fd700d09da8de831b955731acbb604cf79
treea783235734c9e56fe13b38babc86cfce804a6b64
parentc6668c2e7b9908e479527914ca7eb2c838aaab06
parentc22f0bfb8056889ea3180e0adbf46458eabf63a7
Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'

MRF: add mediaproxy warming policy

See merge request pleroma/pleroma!1342