Merge branch 'MDL-58349-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 20 Apr 2017 07:17:59 +0000 (15:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 20 Apr 2017 07:17:59 +0000 (15:17 +0800)
commit626b05c09c416e58f5606febe4068186fa339e15
tree3a4c976e4743c29daee595aa2b0c9c6b01cbf980
parent7b79a90bea08995c0e3d2f6ab64f6d40e2647209
parentd9f730fd691e7d6b933b825dc56aa187f6c217a1
Merge branch 'MDL-58349-master' of git://github.com/damyon/moodle
mod/assign/feedback/editpdf/styles.css
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-min.js
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js