Merge branch 'MDL-68819-master' of git://github.com/lucaboesch/moodle
commit1b88f7567a4dc4dd612b099d30fb37173cc98a4d
authorSara Arjona <sara@moodle.com>
Mon, 25 May 2020 13:47:44 +0000 (25 15:47 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 25 May 2020 13:47:44 +0000 (25 15:47 +0200)
tree469532ee1c028bf71c806718fd909aacc8cea0c9
parentb5b91668312610afe99c473b0cc42501945d7221
parent937c7e5f0ca20cdd7cfcba20d8714b9efb8c0283
Merge branch 'MDL-68819-master' of git://github.com/lucaboesch/moodle