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 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		6 years ago
..
authorizations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
authorized_applications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tokens_controller.rb	…