# Conflicts:
#	app/assets/javascripts/notes/components/note_form.vue
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]