mastodon/app/controllers/auth
Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
2021-05-07 18:21:59 +02:00
..
challenges_controller.rb
confirmations_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
omniauth_callbacks_controller.rb
passwords_controller.rb
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-14 00:30:36 +01:00
setup_controller.rb