Revert "Merge branch 'feature/split-hide-network' into 'develop'"
authorkaniini <nenolod@gmail.com>
Fri, 1 Feb 2019 20:22:58 +0000 (20:22 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 1 Feb 2019 20:22:58 +0000 (20:22 +0000)
commit486749064f72ac5078a42ed339519afbbf48027a
treed639c4f000b3ecafa6c5b7ea8b99f25557ac5141
parent28bfb09b01d324e149e9f36a74db2674a07b07da
Revert "Merge branch 'feature/split-hide-network' into 'develop'"

This reverts merge request !733
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 [deleted file]
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