Merge branch 'MDL-60207-master' of git://github.com/andrewnicols/moodle
commit3662898b7c3d5346472b82e2277f7768c81761bd
authorJun Pataleta <jun@moodle.com>
Thu, 14 Jun 2018 02:29:11 +0000 (14 10:29 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 14 Jun 2018 02:29:11 +0000 (14 10:29 +0800)
tree981e38f42601fcc54c2829db84bb9633563112bb
parent0c34cc5a930b96873f4d863bcecfd47020d874cf
parent460dc37184457b83230109ac0c47e90b8ec5839b
Merge branch 'MDL-60207-master' of git://github.com/andrewnicols/moodle