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.
DatabaseHelper
filter_keywords
spec/helpers
JSON::ParserError
valid_locale_or_nil
config_for