Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
[akkoma] / config / emoji.txt
1 firefox, /emoji/Firefox.gif, Gif,Fun
2 blank, /emoji/blank.png, Fun