mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-11 04:36:45 +00:00
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 |