Merge branch 'MDL-62930-master' of git://github.com/damyon/moodle
commitcebb7ba17c464c74310323f524491acf69b1c0b0
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 10:28:10 +0000 (25 12:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 10:28:10 +0000 (25 12:28 +0200)
tree06671cc720576512eb45720ca257d7f2f08beed7
parent9d4c8d45ef5a687c5137eb78d3e6a964808d3647
parent14ae3b74aa4191926a9b6e37d5a3e3d58c42b815
Merge branch 'MDL-62930-master' of git://github.com/damyon/moodle