Merge branch 'MDL-58888-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Dec 2017 00:04:54 +0000 (01:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Dec 2017 00:04:54 +0000 (01:04 +0100)
commitcb5fb8aea583756494974d40ec625734f6787114
tree83732ab474f05f2ef87f5b66212160d8b584615e
parentdc3f4ac929061d3bdae6efa3aca0d181a1a6bb71
parentd766bbc5b950ae9589bea16f51a05095ddaa9841
Merge branch 'MDL-58888-master' of git://github.com/junpataleta/moodle