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)
commitd7f4f65560cab7c07969c910ffdf742b159cbb22
treebf31be8dd09814da7df4911445490e9a09b46ab9
parentd5330ed12561377e5c464bcc2774ebc692b9ac07
parentcb3258c863f7485551eb28474d60f12547019d34
Merge branch 'bugfix/959-emoji-loading' into 'develop'

Emoji: Use full path to check if a file is a directory.

Closes #959

See merge request pleroma/pleroma!1257