mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
33c80e0783
Conflicts: - app/models/media_attachment.rb |
||
---|---|---|
.. | ||
_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 |