nyastodon/app/views/layouts
Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `spec/models/status_spec.rb`:
  Upstream added tests too close to glitch-soc-specific tests.
  Kept both tests.
2022-01-23 18:24:01 +01:00
..
_theme.html.haml Fix missing media: 'all' on default skins 2022-01-16 22:26:18 +01:00
admin.html.haml Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
application.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-04-05 14:31:07 +02:00
auth.html.haml Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
embedded.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-04-05 14:31:07 +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 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +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 2021-02-12 10:28:32 +01:00
plain_mailer.html.haml HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
public.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-01-23 18:24:01 +01:00