# Conflicts:
#	app/services/clusters/create_service.rb
#	locale/gitlab.pot
#	spec/requests/api/settings_spec.rb

[ci skip]