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 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		6 years ago
..
_login.html.haml	Redesign landing page (#10232)	6 years ago
_registration.html.haml	Admission-based registrations mode (#10250)	6 years ago
more.html.haml	…
show.html.haml	Redesign landing page (#10232)	6 years ago
terms.html.haml	…