mastodon/app/views/layouts
Claire d1780fb9a4 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Removed upstream, while we had a checkbox telling people to check if the
  issue was present upstream. Removed the file as well.
2021-06-30 00:42:52 +02:00
..
_theme.html.haml
admin.html.haml
application.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-04-05 14:31:07 +02:00
auth.html.haml
embedded.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-04-05 14:31:07 +02:00
error.html.haml
mailer.html.haml
mailer.text.erb
modal.html.haml
plain_mailer.html.haml
public.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00