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 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		6 years ago
..
_login.html.haml	Redesign landing page (#10232)	6 years ago
_registration.html.haml	Add "why do you want to join" field to invite requests (#10524)	6 years ago
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
show.html.haml	Do not show timeline preview or directory widgets if they are disabled (#10284)	6 years ago
terms.html.haml	…