mastodon/app/views/layouts
Claire dc68306b8e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to glitch-soc's theming system.
  Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
2023-06-18 16:14:29 +02:00
..
_theme.html.haml Fix glitch-soc HAML linting issues (#2166) 2023-04-07 20:55:28 +02:00
admin.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
application.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-06-18 16:14:29 +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 2023-06-18 16:14:29 +02:00
error.html.haml Switch to using a `common` runtime chunk rather than `locales` 2023-06-10 17:43:13 +02:00
mailer.html.haml Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
mailer.text.erb Replace tutorial modal with welcome e-mail (#6273) 2018-01-18 19:17:25 +01:00
modal.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
plain_mailer.html.haml HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00