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.		2019-03-14 17:17:20 +01:00
..
_login.html.haml
_registration.html.haml	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
more.html.haml
show.html.haml
terms.html.haml