Merge branch 'MDL-61898-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 05:46:56 +0000 (13:46 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 05:46:56 +0000 (13:46 +0800)
commitc39c3edb8ed8b2ba32fea95476363c9360e9b2e6
tree546f0582e8e3c9095460b02b903c7a8c00cf8337
parentfa43449aadcbb4b82f422bc6bd433a90a906782d
parentf7bac7ac8df49a220dd0463e150aad119a66d612
Merge branch 'MDL-61898-master' of git://github.com/andrewnicols/moodle