Conflicts: - `config/settings.yml`: Not a real conflict, upstream removed settings that are identical in glitch-soc but textually adjacent to glitch-soc-only settings. Removed what upstream removed.
Import
Style/OptionalBooleanParameter
reorder(nil)
Style/GuardClause
rubocop
OpenSSL::SSL::SSLError
UnfilterNotificationsWorker