Merge branch 'MDL-42616-master-fixup' of https://github.com/FMCorz/mo…

…odle
roddle · Dec 23, 2014 · d890b55 · d890b55
2 parents 093c161 + ae46ca5
commit d890b55
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/classes/plugin_manager.php b/lib/classes/plugin_manager.php
@@ -1141,7 +1141,7 @@ public static function standard_plugins_list($type) {
 
             'tool' => array(
                 'assignmentupgrade', 'availabilityconditions', 'behat', 'capability', 'customlang',
-                'dbtransfer', 'generator', 'health', 'innodb', 'installaddon',
+                'dbtransfer', 'filetypes', 'generator', 'health', 'innodb', 'installaddon',
                 'langimport', 'log', 'messageinbound', 'multilangupgrade', 'monitor', 'phpunit', 'profiling',
                 'replace', 'spamcleaner', 'task', 'timezoneimport',
                 'unittest', 'uploadcourse', 'uploaduser', 'unsuproles', 'xmldb'