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
..
loaders	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
configuration.js	Fix building assets in test environment	2018-09-13 15:32:02 +02:00
development.js
generateLocalePacks.js
production.js	Upgrade Babel to version 7.0.0 (#5925)	2018-09-14 17:59:48 +02:00
shared.js
test.js
translationRunner.js