Merge branch 'MDL-68968-master' of git://github.com/lameze/moodle
commit0bafd769ec3dd639568a1033c1609dea3a3bf544
authorVictor Deniz Falcon <victor@moodle.com>
Wed, 29 Jul 2020 21:01:06 +0000 (29 22:01 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Wed, 29 Jul 2020 21:01:06 +0000 (29 22:01 +0100)
tree8e4a95840b4f7af52e24b45041b9b48fd479b63b
parentfdf7db9502e6534b0300ef58c6898d6f26751819
parente3c28dffa3fa6186a28a151d8541f547d095b188
Merge branch 'MDL-68968-master' of git://github.com/lameze/moodle