# Conflicts:
#	.gitignore
#	app/assets/javascripts/boards/components/board_sidebar.js
#	app/assets/javascripts/boards/components/sidebar/remove_issue.vue
#	app/workers/all_queues.yml
#	config/sidekiq_queues.yml
#	doc/integration/saml.md
#	spec/models/merge_request_spec.rb

[ci skip]