mastodon/app/controllers/activitypub
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00
..
base_controller.rb Fix locale not being set in REST API (#17847) 2022-03-22 12:29:04 +01:00
claims_controller.rb
collections_controller.rb
followers_synchronizations_controller.rb
inboxes_controller.rb
outboxes_controller.rb
replies_controller.rb