Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

author Ivan Tashkinov <ivantashkinov@gmail.com>

Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)
diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc test/pleroma/user_test.exs
Simple merge
author	Ivan Tashkinov <ivantashkinov@gmail.com>
	Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history