Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jun 2016 18:05:13 +0000 (20:05 +0200)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:04 +0000 (09:04 +0100)
commit392c40467f12afe6477a932c1450bb58f09a10be
treea9fb7a218bb93835f302593659fb911550c34b38
parentd13f2a693406d6611d4cbfb014da4688fea7dc14
parent834f1b66d46df71ea418adfc5b0ba4b932239f65
Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle
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