Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle

Conflicts: lib/db/upgrade.php version.php
2013-08-27 13:16:55 +08:00
parent 92058753ac 3d1808c6e2
commit f6c2af867f
10 changed files with 35 additions and 234 deletions
@@ -734,7 +734,7 @@ class plugin_manager {
            ),

            'format' => array(
-                'scorm', 'singleactivity', 'social', 'topics', 'weeks'
+                'singleactivity', 'social', 'topics', 'weeks'
            ),

            'gradeexport' => array(