# Conflicts:
#	app/assets/stylesheets/pages/settings.scss
#	app/controllers/projects/clusters_controller.rb
#	app/models/group.rb
#	app/workers/project_cache_worker.rb
#	spec/features/admin/admin_settings_spec.rb
#	spec/features/projects/members/share_with_group_and_members_spec.rb
#	spec/features/protected_branches_spec.rb
#	spec/workers/project_cache_worker_spec.rb

[ci skip]