Merge branch 'MDL-61244_master' of https://gitlab.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 1 Jul 2018 23:42:00 +0000 (01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 1 Jul 2018 23:42:00 +0000 (01:42 +0200)
commitaedd74c6109e9d18edfab4144cc634372a8b92fa
treec9a3505b334f22adcd234f671d0a1dd14692b5ec
parentf61ee4e857a894a5b8b69516b00be88ae499964b
parente3389c83b2a3599e27298f98362edf27c86eeefe
Merge branch 'MDL-61244_master' of https://gitlab.com/marxjohnson/moodle
lang/en/admin.php
lib/moodlelib.php