mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 14:45:12 +01:00
d1780fb9a4
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. |
||
---|---|---|
.. | ||
_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 | ||
plain_mailer.html.haml | ||
public.html.haml |