mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 20:03:24 +00: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 |