Merge branch 'MDL-68726-master' of https://github.com/sammarshallou/moodle
commit0cb248077ce8fa118a2d2a128f29030e366dd7a0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jul 2020 22:37:03 +0000 (21 00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jul 2020 22:37:03 +0000 (21 00:37 +0200)
tree469c590ff78748143285260fec671cdd83b06363
parent6c579b60f2afdadf747aea27298e05887fea2526
parent9b3646417e8f64d42df05bfc3f056fde57cf2787
Merge branch 'MDL-68726-master' of https://github.com/sammarshallou/moodle