Merge branch 'twapi-follower-pagination' into 'develop'

author kaniini <nenolod@gmail.com>

Thu, 10 Jan 2019 18:03:32 +0000 (18:03 +0000)

committer kaniini <nenolod@gmail.com>

Thu, 10 Jan 2019 18:03:32 +0000 (18:03 +0000)
author kaniini <nenolod@gmail.com>
Thu, 10 Jan 2019 18:03:32 +0000 (18:03 +0000)
committer kaniini <nenolod@gmail.com>
Thu, 10 Jan 2019 18:03:32 +0000 (18:03 +0000)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
diff --cc test/web/twitter_api/twitter_api_controller_test.exs
Simple merge
author	kaniini <nenolod@gmail.com>
	Thu, 10 Jan 2019 18:03:32 +0000 (18:03 +0000)
committer	kaniini <nenolod@gmail.com>
	Thu, 10 Jan 2019 18:03:32 +0000 (18:03 +0000)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/twitter_api/twitter_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/twitter_api/twitter_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history