Merge branch 'remove-info-from-users' into 'develop'

author rinpatch <rinpatch@sdf.org>

Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)

committer rinpatch <rinpatch@sdf.org>

Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)
author rinpatch <rinpatch@sdf.org>
Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)
committer rinpatch <rinpatch@sdf.org>
Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)
diff --cc benchmarks/load_testing/generator.ex
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc test/user_test.exs
Simple merge
author	rinpatch <rinpatch@sdf.org>
	Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)
committer	rinpatch <rinpatch@sdf.org>
	Sat, 30 Nov 2019 10:42:51 +0000 (10:42 +0000)
		1	2
benchmarks/load_testing/generator.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history