# Conflicts:
#	app/controllers/admin/application_settings_controller.rb
#	config/routes/admin.rb
#	locale/gitlab.pot
#	spec/features/admin/admin_settings_spec.rb

[ci skip]