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)
commit3d7bb4712436ca80b840b35c39674e2f951cecbe
tree64220aeb1a8a3408f0b1f70cfb82a5311cc1d038
parentb9544d565d42cd0705f6f583b328d1034ae8ae97
parent365268d522323c6dcdf0ed977263cbf0f01c984b
Merge branch 'issue/media-proxy-whitelist' into 'develop'

Add more tests for using media_proxy and whitelists

See merge request pleroma/pleroma!1262