Merge branch 'wip-MDL-61966-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 05:11:30 +0000 (13:11 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 05:11:30 +0000 (13:11 +0800)
commitdb711f5eca124d78e3738f23dd7af127e17ccd35
tree331878edcfce6bde386d7c492e892598ebac3e16
parent0683abccfc942c172f37c2b2c30283ac99646f3a
parent5eb8ad87fcbb3ace71efe8ba87e718ee05dc1811
Merge branch 'wip-MDL-61966-master' of git://github.com/abgreeve/moodle