Merge branch 'MDL-68728-master-2' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 18:24:17 +0000 (20:24 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 18:24:17 +0000 (20:24 +0200)
commit0a3efb5689468fe15d8d4de4796a3663064beeb3
treed6b7956f2964971f6f9ffa6bb44ec225f8d34106
parent6462724e4f8492e0b0b85e08c5261f0b07592b52
parent88f1a81bd6965d4f9d77b7834f768b66f0ec16e2
Merge branch 'MDL-68728-master-2' of git://github.com/andrewnicols/moodle