# Conflicts:
#	app/assets/javascripts/notes/components/comment_form.vue
#	app/models/concerns/issuable.rb
#	app/models/merge_request.rb

[ci skip]