# Conflicts:
#	app/assets/javascripts/mr_notes/stores/index.js
#	app/assets/javascripts/notes/components/noteable_note.vue
#	app/services/merge_requests/refresh_service.rb
#	locale/gitlab.pot

[ci skip]