From: eal <eal@waifu.club>
Date: Fri, 15 Jun 2018 20:43:30 +0000 (+0000)
Subject: Merge branch 'bugfix/mastofe_thread_render' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a938d07df1679efd78e1b7c10e149270489761f7;p=akkoma

Merge branch 'bugfix/mastofe_thread_render' into 'develop'

lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads

See merge request pleroma/pleroma!223
---

a938d07df1679efd78e1b7c10e149270489761f7