Merge branch 'wip-MDL-62520_MASTER' of https://github.com/jason-platts/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 10 Sep 2018 08:22:48 +0000 (16:22 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 10 Sep 2018 08:22:48 +0000 (16:22 +0800)
commitf239f97d340d024869170a58df349e847b893217
tree070598de003839bf9554d68eda4046a694a3ca40
parent6e2e63457efc2a5f2ef93d981c39a728f4470cb3
parente52856bc9ae8dee97f897cdec1ae9e05618f5a35
Merge branch 'wip-MDL-62520_MASTER' of https://github.com/jason-platts/moodle
user/lib.php