Merge branch 'MDL-62257-master' of git://github.com/cescobedo/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 01:35:02 +0000 (09:35 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 01:35:02 +0000 (09:35 +0800)
commit24a12d96e5a0c0c414813cc160f002327da9ee17
treeb13a37a370095370009d48d970005d879d2db4d2
parentc3da16f13d41c2c5e2b6c19db8fb8a3e8f350fb9
parent7c7ace009ac1502c97c5ced0572e8b0da85b7c9b
Merge branch 'MDL-62257-master' of git://github.com/cescobedo/moodle