Merge branch 'follower-hiding' into 'develop'

author kaniini <nenolod@gmail.com>

Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)

committer kaniini <nenolod@gmail.com>

Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)
author kaniini <nenolod@gmail.com>
Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)
committer kaniini <nenolod@gmail.com>
Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)
diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge
diff --cc test/web/twitter_api/twitter_api_controller_test.exs
Simple merge
author	kaniini <nenolod@gmail.com>
	Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)
committer	kaniini <nenolod@gmail.com>
	Wed, 5 Dec 2018 21:41:53 +0000 (21:41 +0000)
		1	2
test/web/mastodon_api/mastodon_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/twitter_api/twitter_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history