Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
[akkoma] / priv / static / emoji / Firefox.gif
2017-09-16 Roger BraunMake emoji configurable in files.