Merge branch 'feature/mediaproxy-whitelist' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 25 Apr 2019 23:23:27 +0000 (23:23 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 25 Apr 2019 23:23:27 +0000 (23:23 +0000)
Add mediaproxy whitelist capability

Closes #837

See merge request pleroma/pleroma!1095


Trivial merge