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

lib/editor/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"]});