Merge branch 'MDL-62601-master' of git://github.com/andrewnicols/moodle
commit57c2400b07fe05c2c2b6ccbacad6b26169a3593d
authorDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 05:47:16 +0000 (31 06:47 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 05:47:16 +0000 (31 06:47 +0100)
treee67778d5c915a658ff3cd6266fdc2126b0fdabde
parentdf9813c25b1c0d98b30a7c7cc22bf71d61640477
parent5efa9f4653c4fb8f848472cc7483869d34f5e363
Merge branch 'MDL-62601-master' of git://github.com/andrewnicols/moodle