# Conflicts:
#	app/assets/javascripts/pages/projects/project.js
#	app/views/projects/_home_panel.html.haml
#	config/initializers/1_settings.rb
#	config/sidekiq_queues.yml
#	doc/ci/variables/README.md
#	doc/user/group/index.md
#	doc/user/project/clusters/index.md
#	lib/api/namespaces.rb
#	locale/gitlab.pot

[ci skip]