Merge branch 'feature/1739-account-endpoints' into 'develop'
authorlain <lain@soykaf.club>
Mon, 22 Jun 2020 12:37:10 +0000 (12:37 +0000)
committerlain <lain@soykaf.club>
Mon, 22 Jun 2020 12:37:10 +0000 (12:37 +0000)
account visibility in masto api

Closes #1739

See merge request pleroma/pleroma!2488

1  2 
lib/pleroma/user.ex
lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
lib/pleroma/web/mastodon_api/views/account_view.ex
test/user_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs

Simple merge
Simple merge