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)
1  2 
lang/en/moodle.php
mod/folder/lang/en/folder.php

Simple merge
Simple merge