Merge branch 'MDL-55012-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 12:55:50 +0000 (13:55 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 12:55:50 +0000 (13:55 +0100)
commit151aaa265422b2702a8cbe5340ae6eb3f20ceb2a
tree77fcf6283fad4ed5ae35879fea3f6bdf628aff06
parent2dbaaa9bdcf665a9bcf6cf00c50f4b808459f5f2
parent91445c63f8ce1de3aea7b8e5bdcb5129e0d507d1
Merge branch 'MDL-55012-master' of git://github.com/damyon/moodle
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
lib/editor/atto/yui/src/editor/js/clean.js