mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-16 11:45:19 +00:00
a817f084ea
Conflicts: app/controllers/statuses_controller.rb |
||
---|---|---|
.. | ||
_content_spoiler.html.haml | ||
_detailed_status.html.haml | ||
_media.html.haml | ||
_og_description.html.haml | ||
_og_image.html.haml | ||
_simple_status.html.haml | ||
_status.html.haml | ||
embed.html.haml | ||
show.html.haml |