You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
_features.html.haml	Redesign the landing page, mount public timeline on it (#4122)	7 years ago
_forms.html.haml	Improve styling of closed registrations message, rename button (#6695)	7 years ago
_links.html.haml	Redesign landing page (again) (#6486)	7 years ago
_registration.html.haml	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	6 years ago