aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/controllers/util_controller.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-09-03 05:54:11 +0000
committerkaniini <nenolod@gmail.com>2018-09-03 05:54:11 +0000
commit7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14 (patch)
treec70c18e097045c329b53c2d1de8981bcd5f7b3c0 /lib/pleroma/web/twitter_api/controllers/util_controller.ex
parent072e965015698a3198242aad3ad969a696b8f03e (diff)
parent4257f784bc8e742888e978fccbab0f566c549376 (diff)
downloadpleroma-7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14.tar.gz
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
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
0 files changed, 0 insertions, 0 deletions