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

Merge branch 'nil-bio-emojis' into 'develop' 

add nil clause for Formatter.get_emoji/1 to return an empty result

Closes #274

See merge request pleroma/pleroma!315
parents 072e9650 4257f784
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