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/controllers/activitypub
Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
..
base_controller.rb
claims_controller.rb
collections_controller.rb
followers_synchronizations_controller.rb
inboxes_controller.rb Skip processing Update activities on unknown accounts (#15514) 2021-01-08 12:26:29 +01:00
outboxes_controller.rb
replies_controller.rb