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
..
_features.html.haml	Redesign the landing page, mount public timeline on it (#4122)	2017-07-11 15:27:59 +02:00
_forms.html.haml	Improve styling of closed registrations message, rename button (#6695)	2018-03-08 11:10:37 +01:00
_links.html.haml	Redesign landing page (again) (#6486)	2018-02-22 01:03:48 +01:00
_registration.html.haml	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	2018-08-09 12:58:20 +02:00