Merge branch 'MDL-68690-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jul 2020 22:17:11 +0000 (00:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jul 2020 22:17:11 +0000 (00:17 +0200)
commit9e65bc8fa60d746b25e8ab313cbde72f0b27250b
tree8137e2786c7d98d3bcbedf8dda70bf96f5688fcb
parent22f4eab309fed77912142883404139e73ac34819
parent0deb19468d0e61c0f3c41fb8d350cd2611fad47e
Merge branch 'MDL-68690-master' of https://github.com/sammarshallou/moodle