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
..
confirmations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
omniauth_callbacks_controller.rb	…
passwords_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
registrations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago