Merge branch 'cleanup-activity' into 'develop'

author lain <lain@soykaf.club>

Fri, 13 Sep 2019 14:48:00 +0000 (14:48 +0000)

committer lain <lain@soykaf.club>

Fri, 13 Sep 2019 14:48:00 +0000 (14:48 +0000)
author lain <lain@soykaf.club>
Fri, 13 Sep 2019 14:48:00 +0000 (14:48 +0000)
committer lain <lain@soykaf.club>
Fri, 13 Sep 2019 14:48:00 +0000 (14:48 +0000)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc test/user_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Fri, 13 Sep 2019 14:48:00 +0000 (14:48 +0000)
committer	lain <lain@soykaf.club>
	Fri, 13 Sep 2019 14:48:00 +0000 (14:48 +0000)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history