mastodon/app/lib/activitypub/activity
Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them.
2023-02-19 10:42:55 +01:00
..
accept.rb
add.rb
announce.rb
block.rb
create.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
delete.rb
flag.rb
follow.rb
like.rb
move.rb
reject.rb
remove.rb
undo.rb
update.rb