Merge branch 'MDL-59811-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 17:52:56 +0000 (19:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 17:52:56 +0000 (19:52 +0200)
commiteda80275413c520258dcb260143608c13e9bb8a0
tree62e5890fed731177fd7928ef937b0da8d3137648
parenta5ed356be14bb786b1f0da682ef241dcaa1d0cc8
parent4047fccba7d4245ae67aa30de4aabee2e345db17
Merge branch 'MDL-59811-master' of git://github.com/junpataleta/moodle