Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
[akkoma] / priv / static / finmoji /
2017-06-19 Roger BraunAdd finmoji.