mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
views | ||
schema.rb | ||
seeds.rb |