Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'

author lambda <pleromagit@rogerbraun.net>

Sun, 20 Jan 2019 10:24:05 +0000 (10:24 +0000)

committer lambda <pleromagit@rogerbraun.net>

Sun, 20 Jan 2019 10:24:05 +0000 (10:24 +0000)
author lambda <pleromagit@rogerbraun.net>
Sun, 20 Jan 2019 10:24:05 +0000 (10:24 +0000)
committer lambda <pleromagit@rogerbraun.net>
Sun, 20 Jan 2019 10:24:05 +0000 (10:24 +0000)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc test/user_test.exs
Simple merge
diff --cc test/web/twitter_api/twitter_api_controller_test.exs
Simple merge
author	lambda <pleromagit@rogerbraun.net>
	Sun, 20 Jan 2019 10:24:05 +0000 (10:24 +0000)
committer	lambda <pleromagit@rogerbraun.net>
	Sun, 20 Jan 2019 10:24:05 +0000 (10:24 +0000)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/twitter_api/twitter_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history