Merge branch 'MDL-62968-master' of git://github.com/mickhawkins/moodle
authorSara Arjona <sara@moodle.com>
Fri, 18 Jan 2019 11:38:14 +0000 (12:38 +0100)
committerSara Arjona <sara@moodle.com>
Fri, 18 Jan 2019 11:38:14 +0000 (12:38 +0100)
commitb577f30b8ef1c46344d8f7152a996772508a31c8
tree0f9d4a83437b2df0e20aa4dcd69292bee450ecf2
parentc092f75791be10f8f2ee382cd73ac1cdcf3a6feb
parent341070d5b3ded5d051856fefa5d133552bf73153
Merge branch 'MDL-62968-master' of git://github.com/mickhawkins/moodle