mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 12:52: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. |
||
---|---|---|
.. | ||
accept_spec.rb | ||
add_spec.rb | ||
announce_spec.rb | ||
block_spec.rb | ||
create_spec.rb | ||
delete_spec.rb | ||
flag_spec.rb | ||
follow_spec.rb | ||
like_spec.rb | ||
move_spec.rb | ||
reject_spec.rb | ||
remove_spec.rb | ||
undo_spec.rb | ||
update_spec.rb |