Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 3 May 2019 20:36:13 +0000 (20:36 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 3 May 2019 20:36:13 +0000 (20:36 +0000)
commitd089ff24600455fefc17e91807c61ddc61ba107a
tree6f41a38db4171705866f1f5ee02b4f7747d8188a
parent9907e974ca53020fdfed19eae1b814534fa65eb3
parent38b79461dfe6d14eb95799013b2fdd502e73245c
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'

Fix embeded relationships in Mastodon API

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