# Conflicts:
#	.gitlab-ci.yml
#	app/assets/javascripts/boards/components/board_new_issue.vue
#	app/assets/javascripts/boards/components/sidebar/remove_issue.js
#	app/assets/javascripts/boards/filtered_search_boards.js
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/boards/mixins/sortable_default_options.js
#	app/assets/javascripts/boards/models/issue.js
#	app/controllers/groups/boards_controller.rb
#	app/models/board.rb
#	app/models/group.rb
#	app/models/project.rb
#	app/views/groups/labels/index.html.haml
#	app/views/shared/issuable/_search_bar.html.haml
#	config/routes/group.rb
#	config/routes/project.rb
#	config/sidekiq_queues.yml
#	db/schema.rb
#	doc/README.md
#	doc/api/group_boards.md
#	lib/api/group_boards.rb
#	lib/api/job_artifacts.rb
#	lib/api/merge_requests.rb
#	lib/gitlab/ci/trace.rb
#	spec/controllers/groups/boards_controller_spec.rb
#	spec/factories/boards.rb
#	spec/javascripts/api_spec.js
#	spec/lib/gitlab/ci/trace_spec.rb
#	spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

[ci skip]