Merge branch 'MDL-59399-32' of git://github.com/ryanwyllie/moodle int…

…o MOODLE_32_STABLE
moodle · Sep 12, 2017 · 57d1152 · 57d1152
2 parents 52155a2 + ad44589
commit 57d1152
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...r/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js b/...r/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js
@@ -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"]});