# Conflicts:
#	app/assets/javascripts/pages/projects/project.js
#	app/views/projects/_flash_messages.html.haml
#	config/sidekiq_queues.yml
#	locale/gitlab.pot

[ci skip]