Merge branch 'features/profile-fields-emojo' into 'develop'

author feld <feld@feld.me>

Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)

committer feld <feld@feld.me>

Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)
author feld <feld@feld.me>
Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)
committer feld <feld@feld.me>
Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)
diff --cc lib/pleroma/user.ex
Simple merge
diff --cc test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
Simple merge
author	feld <feld@feld.me>
	Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)
committer	feld <feld@feld.me>
	Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)
		1	2
lib/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history