Conflicts: - `app/helpers/settings_helper.rb`: Upstream added a new helper. Conflict caused by the fact there is a glitch-soc specific helper. Added upstream's new helper in addition to glitch-soc's.
IpBlock#to_cidr
account_id
AnnualReport
PartialAccountSerializer
missing_attribution
formatted_note
formatted_fields
GET /api/v1/profile
collections
outgoing_quotes