Merge branch 'MDL-61573-master' of https://github.com/Kathrin84/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Sep 2018 09:24:49 +0000 (11:24 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Sep 2018 09:24:49 +0000 (11:24 +0200)
commitbac17316149b0051dd42724f06c428d1f0849495
tree1fb04c36892fc774155207615c730e1c9a812962
parent6ef77520cdc7f528ee2958381de5fb0a1e0b200a
parentdf8eec5206284af2174e45cc188c1f0b187ff459
Merge branch 'MDL-61573-master' of https://github.com/Kathrin84/moodle
lang/en/admin.php