mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-27 23:55:52 +00: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. |
||
---|---|---|
.. | ||
activity | ||
parser | ||
activity.rb | ||
adapter.rb | ||
case_transform.rb | ||
dereferencer.rb | ||
linked_data_signature.rb | ||
serializer.rb | ||
tag_manager.rb |