mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-21 14:07:33 +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. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |