Merge branch 'MDL-58388-master' of https://github.com/abias/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 19 Oct 2017 04:47:18 +0000 (12:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 19 Oct 2017 04:47:18 +0000 (12:47 +0800)
1  2 
lang/en/moodle.php

Simple merge