Merge branch 'MDL-57741-master' of git://github.com/cescobedo/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 20 Aug 2018 02:11:49 +0000 (10:11 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 20 Aug 2018 02:11:49 +0000 (10:11 +0800)
commit88dc63c335a7ce5cd4663029c0c62591c4b43772
treea238cb2131ad175c93be54500a8bbc38b199d9e7
parenta9428fab113c47b8468d4b736254db118683c527
parentea3c5ba14b9c3fafdf2abd3316654e4ad5ad00ce
Merge branch 'MDL-57741-master' of git://github.com/cescobedo/moodle