Conflicts: - `app/models/concerns/user/has_settings.rb`: Upstream added a new helper for a setting, where glitch-soc had extra ones. Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
quote_approval_policy
COVERAGE
likes
shares