# Conflicts:
#	app/helpers/application_settings_helper.rb
#	app/models/group.rb
#	db/schema.rb
#	spec/initializers/6_validations_spec.rb
#	spec/lib/gitlab/import_export/safe_model_attributes.yml

[ci skip]