Merge branch 'bugfix/mastofe_thread_render' into 'develop'
authoreal <eal@waifu.club>
Fri, 15 Jun 2018 20:43:30 +0000 (20:43 +0000)
committereal <eal@waifu.club>
Fri, 15 Jun 2018 20:43:30 +0000 (20:43 +0000)
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads

See merge request pleroma/pleroma!223


Trivial merge