Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		2018-09-19 21:46:01 +02:00
..
_action_log.html.haml	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
_status.html.haml	Add missing video descriptions (#8416)	2018-08-24 23:55:41 +02:00
index.html.haml	Group reports by target account (#8674)	2018-09-13 03:44:08 +02:00
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-22 20:56:32 +02:00