mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-55183-master' of git://github.com/abgreeve/moodle

Browse Source 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
This commit is contained in:
David Monllao 2016-07-26 09:52:51 +08:00
commit 1a9c3d587f
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js vendored
View File

@ -2835,6 +2835,7 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorFilepicker]);
"event-simulate",
"event-custom",
"node-event-html5",
"node-event-simulate",
"yui-throttle",
"moodle-core-notification-dialogue",
"moodle-core-notification-confirm",

2
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js vendored
View File

File diff suppressed because one or more lines are too long

1
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js vendored
View File

@ -2821,6 +2821,7 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorFilepicker]);
"event-simulate",
"event-custom",
"node-event-html5",
"node-event-simulate",
"yui-throttle",
"moodle-core-notification-dialogue",
"moodle-core-notification-confirm",

1
lib/editor/atto/yui/src/editor/meta/editor.json
View File

@ -10,6 +10,7 @@
"event-simulate",
"event-custom",
"node-event-html5",
"node-event-simulate",
"yui-throttle",
"moodle-core-notification-dialogue",
"moodle-core-notification-confirm",