Merge branch 'stream-follow-updates' into 'develop'

author lain <lain@soykaf.club>

Wed, 9 Dec 2020 15:52:31 +0000 (15:52 +0000)

committer lain <lain@soykaf.club>

Wed, 9 Dec 2020 15:52:31 +0000 (15:52 +0000)
author lain <lain@soykaf.club>
Wed, 9 Dec 2020 15:52:31 +0000 (15:52 +0000)
committer lain <lain@soykaf.club>
Wed, 9 Dec 2020 15:52:31 +0000 (15:52 +0000)
diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc test/mix/tasks/pleroma/user_test.exs
Simple merge
diff --cc test/pleroma/user_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Wed, 9 Dec 2020 15:52:31 +0000 (15:52 +0000)
committer	lain <lain@soykaf.club>
	Wed, 9 Dec 2020 15:52:31 +0000 (15:52 +0000)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/mix/tasks/pleroma/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history