mastodon/app/views/layouts
Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
2020-07-07 15:58:45 +02:00
..
_theme.html.haml
admin.html.haml
application.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00
auth.html.haml
embedded.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
error.html.haml
mailer.html.haml
mailer.text.erb
modal.html.haml
plain_mailer.html.haml
public.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-04-12 16:50:27 +02:00