Merge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Oct 2017 07:45:44 +0000 (09:45 +0200)
commitb1a9a6a19aa56f2bb739fff88d67b906eca30c91
treeb7524460d136cac6390b59bf28c010dca4e9361c
parent6bc6e460cd351ab41079eaf7ad67274dd2d47b34
parent78da366b560f284eab0ded2f63cece4870cf37e5
Merge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle
lib/adminlib.php
lib/dml/mysqli_native_moodle_database.php
lib/moodlelib.php