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)
1  2 
lang/en/admin.php

Simple merge