Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring

2022-12-15 20:25:25 +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

2022-05-26 22:49:47 +02:00

omniauth_callbacks_controller.rb

Fix crash when external auth provider has no display_name set (#19962)

2022-11-07 15:43:24 +01:00

passwords_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-12-15 20:25:25 +01:00

registrations_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-12-15 20:25:25 +01:00

sessions_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-18 11:19:44 +01:00

setup_controller.rb

Fix new user confirmation page styling

2019-10-01 13:48:47 +02:00