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)
commita938d07df1679efd78e1b7c10e149270489761f7
treee8ac30d08497f4ed0f2c505a371ad748d776c06d
parent00d7d109efd3315cff7e73dfb5b3064bf0dbe25c
parent72c2915ecd0b6578d72b3c9796f4adc8cce83d86
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