Merge branch 'MDL-70102-master' of https://github.com/sammarshallou/moodle
authorSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 14:50:08 +0000 (15:50 +0100)
committerSara Arjona <sara@moodle.com>
Fri, 8 Jan 2021 14:50:08 +0000 (15:50 +0100)
commit6231d34a03a65ff74fde06d5cc0e5e42be8f4b5f
tree48ac2d3443eddfdbe80118310f3da2e5d29b8d66
parente751c980003ed42f50db6e54a559c466776fc641
parentb5568aad80c7eb40b6a7e6d9fb189c0f596f8d19
Merge branch 'MDL-70102-master' of https://github.com/sammarshallou/moodle