Merge branch 'develop' into feature/return-link-for-password-reset
[akkoma] / config / emoji.txt
1 firefox, /emoji/Firefox.gif, Gif,Fun
2 blank, /emoji/blank.png, Fun