Merge branch 'features/profile-fields-emojo' into 'develop'
authorfeld <feld@feld.me>
Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)
committerfeld <feld@feld.me>
Mon, 13 Jul 2020 15:43:46 +0000 (15:43 +0000)
commit8f9ee694ed47709231ffc852d2e82a06468cba06
treee630406cab99481af192bbe3108ded6d460d5147
parent63fef0c0fb8e8d95b441d50e8dac3ef2c782a84f
parentcc7153cd828afef1564b58649875b5529c078054
Merge branch 'features/profile-fields-emojo' into 'develop'

user: Add support for custom emojis in profile fields

See merge request pleroma/pleroma!2741
lib/pleroma/user.ex
test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs