Merge branch 'MDL-60938-master-2' of git://github.com/junpataleta/moodle
commitdf060516ed6747f57b3813a301c3b9de648bc945
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Dec 2017 06:53:15 +0000 (19 07:53 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Dec 2017 06:53:15 +0000 (19 07:53 +0100)
treef96a8a39d7d9a60d19f2eb506d0c7bd4c92e4690
parentd41203c55fe75e22ecbc493990779e2a7e1a6db7
parentaf6c39045ec4ba22a79c32eb114a6f0cd63168a9
Merge branch 'MDL-60938-master-2' of git://github.com/junpataleta/moodle
mod/choice/renderer.php