Merge branch 'revert-0a82a7e6' into 'develop'

lib/pleroma/user/info.ex

lib/pleroma/web/activity_pub/views/user_view.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

lib/pleroma/web/twitter_api/twitter_api_controller.ex

lib/pleroma/web/twitter_api/views/user_view.ex

priv/repo/migrations/20190128181211_split_hide_network.exs

test/web/activity_pub/activity_pub_controller_test.exs

test/web/mastodon_api/mastodon_api_controller_test.exs

test/web/twitter_api/twitter_api_controller_test.exs

test/web/twitter_api/views/user_view_test.exs