Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.
2023-07-13 13:35:15 +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