mirror of https://github.com/Siphonay/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. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| schema.rb | ||
| seeds.rb | ||