You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/controllers/auth
Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
5 years ago
..
challenges_controller.rb glitch-soc theme engine fixes for the challenges controller 6 years ago
confirmations_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
setup_controller.rb Fix new user confirmation page styling 6 years ago