mastodon/app/views/layouts
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
..
_theme.html.haml Fix missing media: 'all' on default skins 2022-01-16 22:26:18 +01:00
admin.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
application.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
auth.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
embedded.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
error.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
mailer.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
mailer.text.erb
modal.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
plain_mailer.html.haml
public.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00