Merge branch 'MDL-63648-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 21:54:06 +0000 (23:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Oct 2018 21:54:06 +0000 (23:54 +0200)
commit1845a5bbaa5e79642a2c3f3f4a5b7f2d9628f115
treeab0552c273f5600abecf713c497de08b0a39237f
parentd6d5ea5d04988a5e7262ab689fd72567644fbca9
parentced982cf152ae2674ee5ce52a0194be35bb85060
Merge branch 'MDL-63648-master' of git://github.com/marinaglancy/moodle