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.
ExistingUsernameValidator
LanguageValidator
mb_chars
PollExpirationValidator
expires_at
Rails/WhereExists
LOWER
URLValidator