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

Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.

2023-04-22 10:06:11 +02:00

4.4 KiB

Raw Blame History

View Raw