# Conflicts:
#	app/controllers/admin/application_settings_controller.rb
#	app/controllers/admin/groups_controller.rb
#	app/controllers/admin/users_controller.rb
#	app/controllers/concerns/service_params.rb
#	app/controllers/groups_controller.rb
#	app/models/project.rb
#	app/views/shared/_clone_panel.html.haml
#	doc/api/settings.md
#	features/admin/users.feature
#	features/steps/admin/users.rb
#	lib/api/settings.rb
#	spec/factories/projects.rb
#	spec/features/issues/reset_filters_spec.rb
#	spec/requests/api/issues_spec.rb