Merge branch 'MDL-63249-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Sep 2018 20:34:51 +0000 (22:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Sep 2018 20:34:51 +0000 (22:34 +0200)
1  2 
lang/en/admin.php

Simple merge