From: kaniini <nenolod@gmail.com>
Date: Mon, 3 Sep 2018 05:54:11 +0000 (+0000)
Subject: Merge branch 'nil-bio-emojis' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14;p=akkoma

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
---

7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14