Merge branch 'MDL-60340_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2019 23:36:51 +0000 (00:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2019 23:36:51 +0000 (00:36 +0100)
commit38b9362a7e340782f1e4cf118374b6a2ce9c92fa
treec3a19a9c75b0bf6d8ccb27529c05f4894c890648
parenta1c99c02cfb62cac7409008e3a16f9fc4923c822
parent7af6528e301c054102cb1be987571997ef03aa9e
Merge branch 'MDL-60340_master' of git://github.com/dmonllao/moodle