Merge branch 'issue/media-proxy-whitelist' into 'develop'
authorlain <lain@soykaf.club>
Mon, 10 Jun 2019 11:34:11 +0000 (11:34 +0000)
committerlain <lain@soykaf.club>
Mon, 10 Jun 2019 11:34:11 +0000 (11:34 +0000)
Add more tests for using media_proxy and whitelists

See merge request pleroma/pleroma!1262


Trivial merge