Merge branch 'MDL-70034_master' of git://github.com/mdjnelson/moodle
authorSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 14:19:22 +0000 (15:19 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 11 Jan 2021 14:19:22 +0000 (15:19 +0100)
commitdf8df7477c4414397d0d8039587b0d5af023d2ba
tree8167e76fc3e88da36ef93ccd3b007db4894ffe38
parent5a8ccff85bbcaf43b4bbb97d97ef32f1a1b24700
parent9c7135ea9297a501c9937e0a99f7a3a70b7289a9
Merge branch 'MDL-70034_master' of git://github.com/mdjnelson/moodle