mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-12 08:25:19 +00:00
2d8be0a6e1
Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information. |
||
---|---|---|
.. | ||
_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 |