Merge branch 'bugfix/mediaproxy-leaks' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 29 Oct 2018 15:28:29 +0000 (15:28 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 29 Oct 2018 15:28:29 +0000 (15:28 +0000)
twitter/mastodon api: always use mediaproxy URLs in attachments

Closes #329

See merge request pleroma/pleroma!400


Trivial merge