Merge branch 'MDL-68390-master' of git://github.com/andrewnicols/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jul 2020 17:34:45 +0000 (19:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jul 2020 17:34:45 +0000 (19:34 +0200)
commitf8666013b3eb0ca8b4c8083e082ffa9b663d4244
tree22427135793a4dce122e71a8342e1446e258f940
parent4d0e43ffc5830400438d83a2852470ed964364c1
parenteb06f92457eaaa9c2d1b4834b7f2b906224cf474
Merge branch 'MDL-68390-master' of git://github.com/andrewnicols/moodle into master