From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Tue, 4 Jun 2019 11:26:42 +0000 (+0000)
Subject: Merge branch 'emoji-loader-fix' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0eb7464c10df109e8aacf734bb092f69192ab5c2;p=akkoma

Merge branch 'emoji-loader-fix' into 'develop'

Emoji: Don't die when files are present in the emoji folder.

Closes #957

See merge request pleroma/pleroma!1245
---

0eb7464c10df109e8aacf734bb092f69192ab5c2