Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 13:58:59 +0000 (15:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 13:58:59 +0000 (15:58 +0200)
commitbdfb19cc2aec4f8f38d9ae40be12a6f167073891
treef5631a63f9466792c3e0e93b46ce753d1a53de71
parent3c724b4218ab6bcf7400880ab07e48844f2cb095
parent9be8052937d125fe931947c3a9548c01a3a46dae
Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle
mod/choice/lang/en/choice.php