# Conflicts:
#	app/assets/javascripts/boards/filtered_search_boards.js
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/pages/projects/issues/show.js
#	app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/finders/merge_requests_finder.rb
#	config/sidekiq_queues.yml

[ci skip]