Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.
2024-01-15 20:01:36 +01:00
..
2018-03-16 22:31:20 +01:00
2022-11-01 15:06:52 +01:00
2022-12-15 16:18:59 +01:00
2022-11-01 15:06:52 +01:00
2023-08-09 11:58:46 +02:00