mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-22 12:58:06 +01:00
bd349cb850
Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
seeds | ||
views | ||
schema.rb | ||
seeds.rb |