This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/lib/activitypub/activity
Claire 040b7d37a4 Merge branch 'main' into glitch-soc/merge-upstream
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.
2022-05-16 09:42:32 +02:00
..
accept.rb
add.rb
announce.rb
block.rb
create.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
delete.rb
flag.rb
follow.rb
like.rb
move.rb
reject.rb
remove.rb
undo.rb
update.rb