Merge branch 'MDL-59984-master' of git://github.com/junpataleta/moodle
commita9f816744bec5cfdc377f60b8d2e9d17bffd7d3b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:37:47 +0000 (17 00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:37:47 +0000 (17 00:37 +0200)
tree81075b3eed468e8b474d4d073682d68efc5faea2
parentd355cb54abe6ebea0c2e89154f12f23a7fab6a51
parenta3bfb41cddb3329483d2db8819e3e885e13b6b1f
Merge branch 'MDL-59984-master' of git://github.com/junpataleta/moodle