Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Conflict due to glitch-soc having a different default site name. Updated the tests as upstream did, keeping glitch-soc's default name. |
||
|---|---|---|
| .. | ||
| admin | ||
| filters | ||
| filters_spec.rb | ||
| instance_spec.rb | ||
| media_spec.rb | ||
| search_spec.rb | ||
| suggestions_spec.rb | ||