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.
resources
TagManager#normalize_domain
api/v1/statuses#context
to_json
rubocop
v1.84.0
v1.84.2
Deprecation
JSON::ParserError
collections
avatar_description
header_description
PATCH /api/v1/profile
normalizes