Merge branch 'feature/1734-user-deletion' into 'develop'

author lain <lain@soykaf.club>

Wed, 20 May 2020 11:43:49 +0000 (11:43 +0000)

committer lain <lain@soykaf.club>

Wed, 20 May 2020 11:43:49 +0000 (11:43 +0000)
author lain <lain@soykaf.club>
Wed, 20 May 2020 11:43:49 +0000 (11:43 +0000)
committer lain <lain@soykaf.club>
Wed, 20 May 2020 11:43:49 +0000 (11:43 +0000)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc test/user_test.exs
Simple merge
diff --cc test/web/activity_pub/side_effects_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Wed, 20 May 2020 11:43:49 +0000 (11:43 +0000)
committer	lain <lain@soykaf.club>
	Wed, 20 May 2020 11:43:49 +0000 (11:43 +0000)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/side_effects_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history