Merge branch 'MDL-62145-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Oct 2018 23:35:09 +0000 (01:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Oct 2018 23:35:09 +0000 (01:35 +0200)
commit980ed5424d6c9103fa1eef281e2a81b0b4416302
treed0820218d2807066e1d14c37a041b6a427b7030d
parent3d18697115683682e13a26fc1325546b41feffc7
parent805f078b1911b05f12325e3d40253ab14d233627
Merge branch 'MDL-62145-master' of git://github.com/damyon/moodle
lang/en/admin.php