Merge branch 'MDL-61407-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 03:50:26 +0000 (11:50 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 03:50:26 +0000 (11:50 +0800)
1  2 
mod/quiz/locallib.php

Simple merge