Merge branch 'MDL-67208-master' of git://github.com/lameze/moodle
authorSara Arjona <sara@moodle.com>
Wed, 30 Jun 2021 14:55:31 +0000 (16:55 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 30 Jun 2021 14:55:31 +0000 (16:55 +0200)
commitfd0321eede8bb5fdc4a269d99aa4d862dd044ecc
treebca5db2d91695202cb556b9c4c4562f0f1c66a9f
parent6ec83644495be4efa8346da7ba66b1e3e940aff8
parent1834f1c9ce9b9fba528e89323aa0e37209925e96
Merge branch 'MDL-67208-master' of git://github.com/lameze/moodle