diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-06-04 11:26:42 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-06-04 11:26:42 +0000 |
| commit | 0eb7464c10df109e8aacf734bb092f69192ab5c2 (patch) | |
| tree | 290c554b486045f080fe88f69407082f7795102e /docs/api | |
| parent | 8ac104cde093991a77079186be02504c121a45fe (diff) | |
| parent | e74581a5c4c3aca68a304efb683dffed80d1337f (diff) | |
| download | pleroma-0eb7464c10df109e8aacf734bb092f69192ab5c2.tar.gz | |
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
Diffstat (limited to 'docs/api')
0 files changed, 0 insertions, 0 deletions