Conflicts: - `CONTRIBUTING.md`: Upstream modified it while we quote upstream's within an otherwise different file. Applied upstream's changes. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| disputes | ||
| filters | ||
| oauth | ||
| settings | ||
| application_controller_spec.rb | ||
| authorize_interactions_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| intents_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| statuses_controller_spec.rb | ||