Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.

2021-02-12 10:28:32 +01:00

..

_theme.html.haml

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

2020-11-07 18:23:02 +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 'master' into glitch-soc/merge-upstream

2020-11-07 18:23:02 +01: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 'master' into glitch-soc/merge-upstream

2020-11-07 18:23:02 +01: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

Add subresource integrity for JS and CSS assets (#15096)

2020-11-06 11:56:31 +01:00