Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.

2022-08-28 11:31:00 +02:00

..

show.html.haml

Merge branch 'main' into glitch-soc/merge-upstream

2022-08-28 11:31:00 +02:00