Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 12:33:36 +0000 (12:33 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 12:33:36 +0000 (12:33 +0000)
commit1c9e539b47ff594d75c9548a04e64cb0c61cff8c
tree26936ac9208ea802e17c78e31689480ff004cd3f
parent8fdddc255ce4fea3060904d27634022718597133
parent6973b77e9462475361772907ddd690a960041b64
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'

Add/Fix Mastodon endpoints for 2.4.3 compatibility

See merge request pleroma/pleroma!266
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/web/mastodon_api/mastodon_api_controller_test.exs