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

2017-10-16 14:10:18 +08:00
parent 274e19dbda ee9e92e594
commit 6af34eb5bf
24 changed files with 2142 additions and 1518 deletions
@@ -84,6 +84,7 @@ class core_component {
        'MatthiasMullie\\PathConverter' => 'lib/minify/matthiasmullie-pathconverter/src/',
        'IMSGlobal\LTI' => 'lib/ltiprovider/src',
        'Phpml' => 'lib/mlbackend/php/phpml/src/Phpml',
+        'PHPMailer\\PHPMailer' => 'lib/phpmailer/src',
    );

    /**