Merge branch 'follower-hiding' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)
commit48a03156465ec5c653101a57d4c899d0c6ffe1cf
tree71fa2bb47955fb5cae463aa002177a9b01692471
parent6ab58fdfa1ce2a4afbedb8c018b2ec617348e640
parent7d5720f2e40015502fe646b86768ab8454f571fe
Merge branch 'follower-hiding' into 'develop'

Network hiding

Closes #356

See merge request pleroma/pleroma!490
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_controller_test.exs