Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 30 Aug 2018 23:06:30 +0000 (23:06 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 30 Aug 2018 23:06:30 +0000 (23:06 +0000)
commite838969495d2ca95406920ceef98d08f01d71192
treec67fa205796d277b4473e7fb040dc625f623dfa8
parent65e8d47cfb74e76bf966a0340fd5ced184c74fec
parent6cbfb5ab5d6eacf2459f137c0b71a9a285c0b576
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'

use media proxy for the suggestions api

See merge request pleroma/pleroma!305
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex