# Conflicts:
#	app/assets/javascripts/diff_notes/diff_notes_bundle.js
#	app/assets/javascripts/notes.js
#	app/assets/javascripts/pages/projects/merge_requests/show/index.js
#	app/assets/javascripts/sidebar/components/assignees/assignees.vue
#	spec/controllers/projects/issues_controller_spec.rb

[ci skip]