Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...

author Ivan Tashkinov <ivantashkinov@gmail.com>

Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge
diff --cc test/user_test.exs
Simple merge
diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge
author	Ivan Tashkinov <ivantashkinov@gmail.com>
	Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Fri, 15 Nov 2019 18:40:14 +0000 (21:40 +0300)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/controllers/account_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/activity_pub/activity_pub_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history