Skip to content
Snippets Groups Projects
Commit b0d0a3fa authored by HJ's avatar HJ :fire:
Browse files

Merge branch 'upstream-hide-custom-emoji' into 'develop' 

Add ability to hide custom emojis in picker

See merge request pleroma/pleroma-fe!1887
parents ae4e3601 88a006eb
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