Merge branch 'MDL-63068_master' of https://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Oct 2018 22:39:45 +0000 (00:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Oct 2018 22:39:45 +0000 (00:39 +0200)
1  2 
lang/en/admin.php

Simple merge