Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 8 Nov 2017 01:43:15 +0000 (14:43 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 8 Nov 2017 01:43:15 +0000 (14:43 +1300)
1  2 
mod/quiz/lang/en/quiz.php

Simple merge