Merge branch 'MDL-62456_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 May 2018 06:56:33 +0000 (08:56 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 May 2018 06:56:33 +0000 (08:56 +0200)
commit36960958ad90fe851e170d2db7ec4dc99f90cbce
tree48a02971bf864a40fefab9a302d3d44bcab618a8
parent798f0f1da9a2bb684cc1a9be365eebe16371beea
parentad7f143897f8220fc13401221658b4bd2595cfc5
Merge branch 'MDL-62456_master' of git://github.com/markn86/moodle