Merge branch 'MDL-68854-master' of git://github.com/vmdef/moodle
authorSara Arjona <sara@moodle.com>
Thu, 28 May 2020 16:11:35 +0000 (18:11 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 28 May 2020 16:11:35 +0000 (18:11 +0200)
commit936bc084fd5660809e4f0ed04ec6333b08e3b0f7
tree7ec5b80c12a5be4e1b33d74fa16d330c208398fc
parent471cc93a457c9fd344de90cf20e82f5943a7261b
parentd4af0f4a74797415101509dccea9b7900560f384
Merge branch 'MDL-68854-master' of git://github.com/vmdef/moodle