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
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-28 17:24:39 +02:00
features
fixtures
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
policies
presenters
requests
routing
services	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
support
validators
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
workers
rails_helper.rb	feat(cookies): Use the same-site attribute to lax (#8626)	2018-09-08 23:54:28 +02:00
spec_helper.rb