Merge branch 'MDL-51885-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 18:09:52 +0000 (19:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 18:09:52 +0000 (19:09 +0100)
commitb3b79085e61847d05bbb5c60d03ff483029664d2
treeed1dc5a9788b837499eabf4322e7ea6994aa3b8e
parent88d7a6a6b7ed916b41b1e51399b102848adf90b5
parent84fe42d8b6c15a1f4854c87a7f8c247d8e978a85
Merge branch 'MDL-51885-master' of git://github.com/ankitagarwal/moodle
lang/en/moodle.php