Claire 630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
..
2017-11-24 02:05:53 +01:00
2023-04-30 14:06:53 +02:00
2023-04-09 11:25:30 +02:00
2023-05-02 12:08:48 +02:00
2020-06-02 19:24:53 +02:00