Skip to content
Snippets Groups Projects
Commit 8f9ee694 authored by feld's avatar feld
Browse files

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

user: Add support for custom emojis in profile fields

See merge request pleroma/pleroma!2741
parents 63fef0c0 cc7153cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment