Merge branch 'MDL-68514-master' of git://github.com/sarjona/moodle
commit74ccea01277484c68627f9c162751b8866f65035
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Apr 2020 17:23:16 +0000 (24 19:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Apr 2020 17:23:16 +0000 (24 19:23 +0200)
treeaf6fe47931b47d4979e8684f9e98311300c7a27b
parent9df4a4de18ace8fa1e02b93d6f0e572fa20ef1a2
parent44642b0a83f4f743e2d695c11aca90bcd5d5714d
Merge branch 'MDL-68514-master' of git://github.com/sarjona/moodle