Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit. |
||
|---|---|---|
| .. | ||
| accept.rb | ||
| add.rb | ||
| announce.rb | ||
| block.rb | ||
| create.rb | ||
| delete.rb | ||
| flag.rb | ||
| follow.rb | ||
| like.rb | ||
| move.rb | ||
| reject.rb | ||
| remove.rb | ||
| undo.rb | ||
| update.rb | ||