b474cbbd28
Conflicts: - `app/controllers/api/v1/accounts/relationships_controller.rb`: We differed by listing suspended users when requesting relationships. Updated to upstream's code. |
||
|---|---|---|
| .. | ||
| credentials_controller_spec.rb | ||
| familiar_followers_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| identity_proofs_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| lookup_controller_spec.rb | ||
| notes_controller_spec.rb | ||
| pins_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||