mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-12 18:52:52 -05:00
f224237862
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.