mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 08:25:55 +00:00
01eaeab56d
Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system. |
||
---|---|---|
.. | ||
_attachment_list.html.haml | ||
_detailed_status.html.haml | ||
_og_description.html.haml | ||
_og_image.html.haml | ||
_poll.html.haml | ||
_simple_status.html.haml | ||
_status.html.haml | ||
embed.html.haml | ||
show.html.haml |