Merge branch 'MDL-60171' of https://github.com/cbluesprl/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:13:25 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:13:25 +0000 (00:13 +0200)
1  2 
lang/en/moodle.php

Simple merge