Merge branch 'emoji-loader-fix' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 4 Jun 2019 11:26:42 +0000 (11:26 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Tue, 4 Jun 2019 11:26:42 +0000 (11:26 +0000)
commit0eb7464c10df109e8aacf734bb092f69192ab5c2
tree290c554b486045f080fe88f69407082f7795102e
parent8ac104cde093991a77079186be02504c121a45fe
parente74581a5c4c3aca68a304efb683dffed80d1337f
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