Merge branch 'MDL-61162-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 21:57:12 +0000 (22:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 21:57:12 +0000 (22:57 +0100)
commitd2d919e4780db2466016b5512a3b9d917812029f
treeea40b3d269c02aa802bf3d28b6e99e202806b5d6
parentd7ba45290b941237f24408dfb7f5f00512566e26
parent0552bc77bab29b362402140c43bacab1e21d4d1d
Merge branch 'MDL-61162-master' of git://github.com/junpataleta/moodle