Merge branch 'MDL-51227-master' of https://github.com/dthies/moodle
commit6a0deee4414c9766287bbf8e30fe8dbd7c5ed64f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 22:25:31 +0000 (1 00:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 22:25:31 +0000 (1 00:25 +0200)
treea7699f52e0474afa7384b9c3c98332115af840be
parent9fb434a618430437c0e91faf692eb31388df5507
parent7bb2069bfa7a4e0d2d53ce9049c5ec1a16cf8682
Merge branch 'MDL-51227-master' of https://github.com/dthies/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