Merge branch 'MDL-67040_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 23:06:30 +0000 (00:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 23:06:30 +0000 (00:06 +0100)
commit2b12a3668fedb378ccf88577669659685109360b
tree938ca7950cb060f1838bb0ce8f4f7c3e3f7c8433
parent6e2c4af47d1e1cffb5048d0dbced7e998855da04
parent6429236fcf7c372d64c33f1736a6d3892e7ee14b
Merge branch 'MDL-67040_master' of git://github.com/dmonllao/moodle