Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
[akkoma] / config / emoji.txt
2017-09-16 Roger BraunMake emoji configurable in files.