Merge branch 'MDL-59929' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Sep 2017 09:54:11 +0000 (10:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Sep 2017 09:54:11 +0000 (10:54 +0100)
1  2 
lang/en/moodle.php

Simple merge