Merge branch 'MDL-49279-master' of git://github.com/jleyva/moodle

Conflicts: lib/classes/plugin_manager.php
2016-04-19 16:55:01 +08:00
parent bc577c541f b2478ed0f6
commit 9a1414c4d8
7 changed files with 330 additions and 1 deletions
@@ -1900,7 +1900,7 @@ class core_plugin_manager {
            'tool' => array(
                'assignmentupgrade', 'availabilityconditions', 'behat', 'capability', 'cohortroles', 'customlang',
                'dbtransfer', 'filetypes', 'generator', 'health', 'innodb', 'installaddon',
-                'langimport', 'log', 'lp', 'lpmigrate', 'messageinbound', 'multilangupgrade', 'monitor',
+                'langimport', 'log', 'lp', 'lpmigrate', 'messageinbound', 'mobile', 'multilangupgrade', 'monitor',
                'phpunit', 'profiling', 'recyclebin', 'replace', 'spamcleaner', 'task', 'templatelibrary',
                'unittest', 'uploadcourse', 'uploaduser', 'unsuproles', 'xmldb'
            ),