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 90f5d780cb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it.		4 years ago
..
challenges_controller.rb	glitch-soc theme engine fixes for the challenges controller	5 years ago
confirmations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
omniauth_callbacks_controller.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
passwords_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
registrations_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
setup_controller.rb	Fix new user confirmation page styling	5 years ago