projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8ac104c
e74581a
)
Merge branch 'emoji-loader-fix' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Tue, 4 Jun 2019 11:26:42 +0000
(11:26 +0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Tue, 4 Jun 2019 11:26:42 +0000
(11:26 +0000)
Emoji: Don't die when files are present in the emoji folder.
Closes #957
See merge request pleroma/pleroma!1245
Trivial merge
projects / akkoma / commitdiff