Merge branch 'MDL-59434-master' of https://github.com/sammarshallou/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 21 Mar 2018 02:00:47 +0000 (10:00 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 21 Mar 2018 02:00:47 +0000 (10:00 +0800)
commit9a2bf09d1904277e7112db35f46d3b811b042bad
treec4a29e3925ad0d3628e389dd028af8f093943bee
parent618b223302166bfe7a2772874d79931dbc79ab37
parentfc440796e9845bb70eac498efafeb7fa766cbfc5
Merge branch 'MDL-59434-master' of https://github.com/sammarshallou/moodle