mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 21:15:58 +00:00
24968d20a0
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock |
||
---|---|---|
.. | ||
_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 |