Merge branch 'MDL-53200-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2016 20:23:16 +0000 (21:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Mar 2016 20:23:16 +0000 (21:23 +0100)
commit25a73245c05328dba22ebdfb760f68d1f16f17b7
tree9d46e38a707bd8800dd348dee1be907d84994a63
parent73911de50ddcaeb32e0841b5ffc741c3061558b4
parent054b863d2fa5aefe91efa1735d7f0f037d3b41bd
Merge branch 'MDL-53200-master-enfix' of git://github.com/mudrd8mz/moodle
lang/en/moodle.php
mod/folder/lang/en/folder.php