Merge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Nov 2017 11:45:22 +0000 (12:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Nov 2017 11:45:22 +0000 (12:45 +0100)
commitf816ea9a6752fc892b98d1100b0622810a42d501
treeb571dc827138c7a7fa92af9331d886988a2b189d
parent6e3314f044f5f847704965e9b083e4c2eb38f3a9
parentc39a22f6009f1ff8eb2ca6e844c077ddeed1bdf4
Merge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle