Merge branch 'MDL-66132-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2019 18:56:29 +0000 (20:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2019 18:56:29 +0000 (20:56 +0200)
commit797ef873445d0528aee851c0bd68edb693cdcd07
treec2a0d60cadd6f83ffc8c9254c4a9dc14d01edc8c
parentc5b9f7fd70771e9a17405b55e840d6ea8942f8f1
parented73ff2b0e3d5a6a45eeece43e14b25bfa8efa8d
Merge branch 'MDL-66132-master' of https://github.com/sammarshallou/moodle