mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 18:28:50 +09: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 |