Merge branch 'nil-bio-emojis' into 'develop'
authorkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 05:54:11 +0000 (05:54 +0000)
committerkaniini <nenolod@gmail.com>
Mon, 3 Sep 2018 05:54:11 +0000 (05:54 +0000)
commit7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14
treec70c18e097045c329b53c2d1de8981bcd5f7b3c0
parent072e965015698a3198242aad3ad969a696b8f03e
parent4257f784bc8e742888e978fccbab0f566c549376
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
lib/pleroma/formatter.ex
test/formatter_test.exs