Merge branch 'MDL-60779-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 11 Nov 2017 12:03:54 +0000 (13:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 11 Nov 2017 12:03:54 +0000 (13:03 +0100)
commitd334aea2081d9618f1de958c30282a45a6c304ee
tree468ff2e32fdb3f5e1804c9cf8cd7960ebf89ddec
parentab9936962ec0638a014529b3f2c8e08a6ae618c0
parent0cf288757df1bd372e17e773fc6ef0658ac4254b
Merge branch 'MDL-60779-master' of git://github.com/junpataleta/moodle