Merge branch 'MDL-65987-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2020 17:28:35 +0000 (18:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2020 17:28:35 +0000 (18:28 +0100)
1  2 
lang/en/moodle.php

Simple merge