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.
to_json
added_to_collection
collection_updated
Layout/EmptyLineAfterGuardClause
PollExpirationNotifyWorker
JSON.generate
missing_attribution