Merge branch 'MDL-68746-master-fix' of git://github.com/sarjona/moodle
commita987c5453919b1546616e6e772398635a81a68ee
authorVíctor Déniz Falcón <victor@moodle.com>
Thu, 28 May 2020 10:46:39 +0000 (28 11:46 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Thu, 28 May 2020 10:46:39 +0000 (28 11:46 +0100)
treec67d681a307483337fea857585b087c1566bc57d
parent87fd36a696f68f3f76b3f23dcca8abea038afde7
parentdcbc830cfad888c382b1d49a2b785de51f8f3fbc
Merge branch 'MDL-68746-master-fix' of git://github.com/sarjona/moodle