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)
commitfbbc5fc91970b2dccb2888e343cad42de8a157bb
tree53e1dc6cdd0d88c7f09a6443f361aa4f221adbf0
parent658036881d132e22cb033dff1ac2bdbd74e802a1
parent5c6ec2d9fc0bd9e6b49906ea58f163264c37a54e
Merge branch 'bugfix/mediaproxy-leaks' into 'develop'

twitter/mastodon api: always use mediaproxy URLs in attachments

Closes #329

See merge request pleroma/pleroma!400