Merge branch 'feature/split-hide-network' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 1 Feb 2019 17:05:29 +0000 (17:05 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 1 Feb 2019 17:05:29 +0000 (17:05 +0000)
commit0a82a7e6d6f92bf3ca83cf039a445f7c8ce23336
tree119d8103065971b10b915056d59d30c584ef00d9
parentfc7644798d72a6b8c99fb05196ec9143d00e9ef4
parent3e968f9ef22f48819f5f08a493ccf13d6b52cca8
Merge branch 'feature/split-hide-network' into 'develop'

Split hide_network into hide_followers & hide_followings

See merge request pleroma/pleroma!733
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/activity_pub/activity_pub_controller_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs