Merge branch 'MDL-51227-m28-master' of https://github.com/dthies/moodle into MOODLE_2...
commit474b1e0040691f5589afded7d074475053fe50c7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 22:35:25 +0000 (1 00:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Sep 2015 22:35:25 +0000 (1 00:35 +0200)
tree54862f26710e87c8c9cf47f73e18fc1d85cb9786
parent9194f5911b89ef7bd6d92a501a8fe42d1fdeba27
parenta59f24b90448f7495a2a05a798e221972823b49d
Merge branch 'MDL-51227-m28-master' of https://github.com/dthies/moodle into MOODLE_28_STABLE
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