Merge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 06:12:26 +0000 (08:12 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 06:12:26 +0000 (08:12 +0200)
commitdc9f39bfc36f67cc20d3527eb5b9103a355f78d5
treeee8135c5f6dee90f5383ea4787b1158fa62c2519
parent651f1a1703b99bd04a906d94ca7e03f6c44f9865
parent7d659f21679fcabbc6c232a510e38ef2eb299d67
Merge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle