Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
[akkoma] / priv / static / static / font / font / fontello.svg
priv/static/static/font/font/fontello.svg