From: lain <lain@soykaf.club>
Date: Mon, 10 Jun 2019 11:34:11 +0000 (+0000)
Subject: Merge branch 'issue/media-proxy-whitelist' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3d7bb4712436ca80b840b35c39674e2f951cecbe;p=akkoma

Merge branch 'issue/media-proxy-whitelist' into 'develop'

Add more tests for using media_proxy and whitelists

See merge request pleroma/pleroma!1262
---

3d7bb4712436ca80b840b35c39674e2f951cecbe