Merge branch 'MDL-66568-master-2' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jun 2020 15:57:17 +0000 (17:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jun 2020 15:57:17 +0000 (17:57 +0200)
commita68004a433b7e7b9d77ae349eb76484d239a076b
treef5d792231e8f9224112c10e8576f75a0db1dc927
parentbd23521ca07db9dc9b97a0bc813ffbc57c4cd86e
parentc7fb9fe55a080b99d4af9e50891aebc5d1b0c9e7
Merge branch 'MDL-66568-master-2' of git://github.com/andrewnicols/moodle