Merge branch 'issue/1878' into 'develop'

author lain <lain@soykaf.club>

Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)

committer lain <lain@soykaf.club>

Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)
author lain <lain@soykaf.club>
Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)
committer lain <lain@soykaf.club>
Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc test/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)
committer	lain <lain@soykaf.club>
	Thu, 23 Jul 2020 10:56:33 +0000 (10:56 +0000)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/admin_api/controllers/admin_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history