mastodon/app/controllers/api/v1/accounts
Claire 3869daef09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
..
credentials_controller.rb
familiar_followers_controller.rb Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
featured_tags_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
identity_proofs_controller.rb
lists_controller.rb
lookup_controller.rb Fix error when looking handle with surrounding spaces (#18225) 2022-05-02 01:00:08 +02:00
notes_controller.rb
pins_controller.rb
relationships_controller.rb
search_controller.rb
statuses_controller.rb Fix performance of account timelines (#17709) 2022-03-08 09:14:39 +01:00