Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
..
2019-09-29 21:31:51 +02:00
2023-07-13 09:36:07 +02:00
2023-06-06 10:42:47 +02:00
2020-10-12 16:33:49 +02:00
2023-07-13 09:36:07 +02:00
2023-04-09 11:25:30 +02:00