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
..
2017-11-24 02:05:53 +01:00
2023-04-09 11:25:30 +02:00
2020-06-02 19:24:53 +02:00
2023-04-12 10:06:57 +02:00
2023-04-09 11:25:30 +02:00