mirror of https://github.com/tootsuite/mastodon
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. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| base_controller.rb | ||
| oembed_controller.rb | ||
| push_controller.rb | ||
| salmon_controller.rb | ||
| subscriptions_controller.rb | ||