Skip to content
Snippets Groups Projects
Commit 7fcbda70 authored by kaniini's avatar kaniini
Browse files

Merge branch 'rework-emoji-management' into 'develop' 

Remove finmoji and add a way to download emojis in packs

Closes #817 and #821

See merge request pleroma/pleroma!1073
parents 6c0e07b8 3cefdc62
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 398 additions and 101 deletions
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