Merge branch 'feature/mediaproxy-inline-images' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 16 Sep 2018 02:25:11 +0000 (02:25 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 16 Sep 2018 02:25:11 +0000 (02:25 +0000)
html: support mediaproxy for inline images

Closes #275

See merge request pleroma/pleroma!346


Trivial merge