Merge branch 'MDL-2051-master-2' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Dec 2017 00:25:14 +0000 (01:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Dec 2017 00:25:14 +0000 (01:25 +0100)
1  2 
mod/choice/view.php

Simple merge