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
..
assets.js	Improve eslint rules (#3147)	2017-05-20 17:31:47 +02:00
babel.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
babel_external.js	Remove prop types from external libraries (#5304)	2017-10-10 18:44:51 +02:00
mark.js	Add improved performance marks for development mode (#3297)	2017-05-25 14:09:55 +02:00
sass.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-16 14:50:42 +02:00