Merge branch 'MDL-63729-master' of git://github.com/dpalou/moodle
commit06a0161ad1e5d0b0f71acd50ac836ef4e72efa52
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Nov 2018 16:44:18 +0000 (12 17:44 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Nov 2018 16:44:18 +0000 (12 17:44 +0100)
tree976367886d6a4e4feabd9d821c68104ec4525b3b
parente1266eaf4bdad8c9eac68ca2751d2316025752cd
parent5bb1889f43ea188908d2e020948700f1ba6c5ca1
Merge branch 'MDL-63729-master' of git://github.com/dpalou/moodle