Merge branch 'MDL-54890-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
commit2c478380d8db5bd5a45f424fc8eb76b8153a1900
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jun 2016 18:09:29 +0000 (13 20:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jun 2016 18:09:29 +0000 (13 20:09 +0200)
treed1315217c558034a92e01aa0f8d9f89a9fb24c82
parent112b98def7ebddb298ca3fb0d4869e6228ef9670
parent014c45b7ac46dacc0e74012655dcd1f89e3db0bf
Merge branch 'MDL-54890-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
mod/assign/feedback/editpdf/yui/src/editor/js/comment.js