mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-12 22:25:10 +01:00
fdd0beefa7
Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours. |
||
---|---|---|
.. | ||
_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 |