mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-06 06:52:48 -05:00
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.