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.
ExistingUsernameValidator
LanguageValidator
message
NoteLengthValidator
PollExpirationValidator
expires_at
Oj.load
JSON.parse
LOWER
URLValidator
Rails/WhereExists