Merge branch 'MDL-69160-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jul 2020 21:29:29 +0000 (23:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jul 2020 21:29:29 +0000 (23:29 +0200)
commit8e44da5653d5ab9ee8fc642ae5e70fedcb8951e3
treee15e638fe68e5700e61aed6271a0ffb792ea5e88
parente948a6354e9a57c748e999cf430d8ba7c050a947
parentb0627a1a114d58f54690a4e11ab177d02a8e2b71
Merge branch 'MDL-69160-master' of git://github.com/andrewnicols/moodle