Merge branch 'wip-MDL-62289-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 05:52:46 +0000 (13:52 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 05:52:46 +0000 (13:52 +0800)
commit4a70fd99737ad4cfdb7a98bc8befc1b8a5580032
tree142dab23cf9026a53ccd2b643b02604f58225ebd
parentf5b667f1c529fb7aa4461f19f09f09c9b7cce656
parentc8e4922194281607971ba7338adfcd6583dd4ab9
Merge branch 'wip-MDL-62289-master' of git://github.com/abgreeve/moodle