Merge branch 'MDL-69134-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jul 2020 18:53:11 +0000 (20:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jul 2020 18:53:11 +0000 (20:53 +0200)
commitcdbb433c3273483d9b4fcf247842966abba7a326
tree449242c52acc57b5bf8533bcbe263f59ca1fa185
parent0524f3ae5b29efae21c2defbb310fa0170e4eca0
parent63a66eb2ce1959a5aed845fbd48814ca7e3b5194
Merge branch 'MDL-69134-master' of git://github.com/andrewnicols/moodle