mastodon/app/lib/activitypub/activity
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
2023-07-30 16:11:55 +02:00
..
accept.rb
add.rb
announce.rb
block.rb
create.rb Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
delete.rb
flag.rb Fix crash when processing Flag activity with no status (#26189) 2023-07-27 16:11:56 +02:00
follow.rb
like.rb
move.rb
reject.rb
remove.rb
undo.rb
update.rb