mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
3e686beaea
Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it. |
||
---|---|---|
.. | ||
_action_log.html.haml | ||
_status.html.haml | ||
index.html.haml | ||
show.html.haml |