moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle

Browse source
This commit is contained in:
David Monllao 2017-09-12 08:12:26 +02:00
commit dc9f39bfc3
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js vendored
View file

@ -956,4 +956,4 @@ Y.namespace('M.atto_media').Button = Y.Base.create('button', Y.M.editor_atto.Edi
}); });
}, '@VERSION@', {"requires": ["moodle-editor_atto-plugin"]}); }, '@VERSION@', {"requires": ["moodle-editor_atto-plugin", "moodle-form-shortforms"]});

2
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js vendored
View file

File diff suppressed because one or more lines are too long

2
lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js vendored
View file

@ -956,4 +956,4 @@ Y.namespace('M.atto_media').Button = Y.Base.create('button', Y.M.editor_atto.Edi
}); });
}, '@VERSION@', {"requires": ["moodle-editor_atto-plugin"]}); }, '@VERSION@', {"requires": ["moodle-editor_atto-plugin", "moodle-form-shortforms"]});

3
lib/editor/atto/plugins/media/yui/src/button/meta/button.json
View file

@ -1,7 +1,8 @@
{ {
"moodle-atto_media-button": { "moodle-atto_media-button": {
"requires": [ "requires": [
"moodle-editor_atto-plugin" "moodle-editor_atto-plugin",
"moodle-form-shortforms"
] ]
} }
} }