mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 11:11:11 +02:00
Conflicts: - `db/schema.rb`: Upstream re-generated the file, which reordered all the definitions. Re-generated the files as well.
Conflicts: - `db/schema.rb`: Upstream re-generated the file, which reordered all the definitions. Re-generated the files as well.