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
api/v1/peers/search
api/v1/trends/*
include_pagination_headers
Link
fake!
inline!
api/v1/media
capture_emails