Merge branch 'develop' into feature/push-subject-for-dm
[akkoma] / config / emoji.txt
1 firefox, /emoji/Firefox.gif, Gif,Fun
2 blank, /emoji/blank.png, Fun