Merge branch 'MDL-60078-master-fix' of https://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 25 Jan 2018 06:47:14 +0000 (14:47 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 25 Jan 2018 06:47:14 +0000 (14:47 +0800)
commitefd934392480fcf49702c25257fa0cc47767d521
treeedc8a6811af2472cf2b99039fad8648101b7ba81
parent0b048da8c028affcc3632cfe0b5da7fb2d690759
parentdd4ac3d2cee47cf486382f33fefb875a205edd76
Merge branch 'MDL-60078-master-fix' of https://github.com/andrewnicols/moodle