Merge branch 'MDL-61033-master' of https://github.com/nashtechdev01/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Apr 2018 02:37:23 +0000 (10:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Apr 2018 02:37:23 +0000 (10:37 +0800)
1  2 
mod/quiz/locallib.php

Simple merge