Merge branch 'MDL-68241-master' of git://github.com/ferranrecio/moodle
commit0fd6b977b6f617e0c6690c0adbfadb0da9996ed3
authorSara Arjona <sara@moodle.com>
Thu, 14 May 2020 07:55:35 +0000 (14 09:55 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 14 May 2020 07:55:35 +0000 (14 09:55 +0200)
tree7a39d3842719d525fc069ed1286810078aa0f277
parentb75a1843122870b841f7b5a29f668b2dbdd35847
parent4d0241e488507cda52d638f7c77986b61e4e46bb
Merge branch 'MDL-68241-master' of git://github.com/ferranrecio/moodle