Merge branch 'MDL-70409-master' of git://github.com/merrill-oakland/moodle
authorSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 15:15:34 +0000 (16:15 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Dec 2020 15:15:34 +0000 (16:15 +0100)
commitdf7701598b65162c07070c8ebbb3b1d18a8b6c3d
tree352b2832bb9d7a933a4bbbdceb2642be139f122f
parentcb9b0032be18c463d6b6f7bf042cf1d96ae8e260
parent9e830efe9d972067d5c6d7bf10b0ba9403fe6791
Merge branch 'MDL-70409-master' of git://github.com/merrill-oakland/moodle