mastodon/app/controllers/auth
Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.
2022-01-16 18:11:20 +01:00
..
challenges_controller.rb glitch-soc theme engine fixes for the challenges controller 2019-09-30 13:37:13 +02:00
confirmations_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
omniauth_callbacks_controller.rb Fix undefined variable for Auth::OmniauthCallbacksController (#16654) 2021-08-25 17:40:56 +02:00
passwords_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-06 00:15:38 +01:00
registrations_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-06 00:15:38 +01:00
sessions_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-16 18:11:20 +01:00
setup_controller.rb Fix new user confirmation page styling 2019-10-01 13:48:47 +02:00