# Conflicts:
#	app/assets/javascripts/boards/index.js
#	app/helpers/blob_helper.rb
#	app/views/projects/blob/_header.html.haml
#	app/views/projects/edit.html.haml
#	app/views/projects/tree/_tree_header.html.haml
#	config/gitlab.yml.example
#	config/sidekiq_queues.yml
#	config/webpack.config.js
#	db/schema.rb
#	qa/qa/page/merge_request/show.rb
#	spec/helpers/issuables_helper_spec.rb
#	spec/support/db_cleaner.rb

[ci skip]