Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
[akkoma] / config / emoji.txt
1 firefox, /emoji/Firefox.gif, Gif,Fun
2 blank, /emoji/blank.png, Fun