# Conflicts:
#	app/controllers/projects/issues_controller.rb
#	locale/gitlab.pot
#	spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js

[ci skip]