Merge branch 'MDL-61359-master' of git://github.com/mickhawkins/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 9 Jul 2018 04:10:33 +0000 (12:10 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 9 Jul 2018 04:10:33 +0000 (12:10 +0800)
commit545a1382aa9174c8473af3da486cb931c614a0d2
treea7cbed9ef4ee890862229a6b7313bb7109d0dabf
parentc7d148dc202ea5667a04b8677df8b6f3b9182fc9
parent6924e32e4abd4edf5c7dc68437fb1b6ba598525f
Merge branch 'MDL-61359-master' of git://github.com/mickhawkins/moodle