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)
commit22c366a85f2a41c1344b863446491c866c47a8a4
treea86b9305ab0ae4ca4847262c231def17db551cfc
parent28812752918c59bedc3526c0a4ac7c490d1a5b22
parent5acfa2e0919f459beae6ada55d087db8a74949e1
Merge branch 'feature/mediaproxy-inline-images' into 'develop'

html: support mediaproxy for inline images

Closes #275

See merge request pleroma/pleroma!346