Merge branch 'MDL-51885-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 18:09:52 +0000 (19:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 18:09:52 +0000 (19:09 +0100)
1  2 
lang/en/moodle.php

Simple merge