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)
commit96f1440b7a035bcf4cd438501c830193896781e6
tree25ead92cf490b55a20a3aa0b3d3dbd437c46d18f
parentf9095b66f24ae40468485f1171ff1686fe6a11e8
parent33a3ec7c9378e64c6f15c688a3c68a39114aa29d
Merge branch 'MDL-58388-master' of https://github.com/abias/moodle
lang/en/moodle.php