(cherry picked from commit 4e98b78672fdd90822dde1c4c3fd4765ef14b864)

Conflicts:
	app/assets/javascripts/notes/components/note_form.vue