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

Simple merge