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
..
chewy	Get rid of Chewy order/limit warning (#8355)	2018-08-22 02:44:56 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
mailers	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-26 21:22:43 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
workers	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00