# Conflicts:
#	app/assets/javascripts/notes/components/comment_form.vue
#	app/assets/javascripts/notes/components/noteable_discussion.vue
#	app/assets/javascripts/notes/components/noteable_note.vue
#	doc/user/admin_area/custom_project_templates.md
#	locale/gitlab.pot
#	spec/migrations/delete_inconsistent_internal_id_records_spec.rb

[ci skip]