mastodon/app/views/layouts
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
admin.html.haml
application.html.haml
auth.html.haml
embedded.html.haml
error.html.haml
mailer.html.haml
mailer.text.erb
modal.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
plain_mailer.html.haml
public.html.haml