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.
api/v1/featured_tags/suggestions
public_visibility
max_pinned_statuses
use_pack
layouts/theme
@theme
before_all
requests/cache_spec