mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
9adeaf2bfc
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system |
||
---|---|---|
.. | ||
_bio.html.haml | ||
_header.html.haml | ||
_moved.html.haml | ||
_og.html.haml | ||
show.html.haml |