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 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		5 years ago
..
challenges_controller.rb	…
confirmations_controller.rb	…
omniauth_callbacks_controller.rb	…
passwords_controller.rb	…
registrations_controller.rb	…
sessions_controller.rb	…
setup_controller.rb	…