Merge branch 'MDL-62610-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 16:00:08 +0000 (18:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 16:00:08 +0000 (18:00 +0200)
1  2 
lang/en/moodle.php

Simple merge