tree ca678861f14979d34fcd32fe2ac9d095b92a7c5f
parent 72e1f848927e3c22b509e350679fe6e038ccdaf7
parent 9357f8cc3b0e1c652b1cb39170c4d766b4bd7e77
author Han Seoul-Oh <laughinghan@gmail.com> 1481335913 -0800
committer Han Seoul-Oh <laughinghan@gmail.com> 1481335913 -0800

Merge branch 'master' into build.release-process

Conflicts:
	src/services/textarea.js
	- on build.release-process, in 4e2a50f "Fix jQuery dependency to
	  be 1.5.2+", changed `.on('cut', ...)` to `.bind('cut', ...)`
	- on master, in #692 "`substituteKeyboardEvents` config option",
	  moved listener for DOM 'cut' event into `saneKeyboardEvents()`
	  (which already used `.bind()` instead of `.on()`)