Merge branch 'bugfix/959-emoji-loading' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 8 Jun 2019 10:10:34 +0000 (10:10 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 8 Jun 2019 10:10:34 +0000 (10:10 +0000)
Emoji: Use full path to check if a file is a directory.

Closes #959

See merge request pleroma/pleroma!1257


Trivial merge