Merge branch 'MDL-69520-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 15 Oct 2020 05:53:26 +0000 (13:53 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 15 Oct 2020 05:53:26 +0000 (13:53 +0800)
commit8252b24f95fb8a4ade6bf2e0bac29f505ab1eb70
treed64b50a945cd77dac804ec4a8c21c3705250c91d
parente5371191c651322bdb1e1d04ad219db8cdf3b4dc
parent0c69575cc4bf83c8e28edca2f3af718580231aef
Merge branch 'MDL-69520-master' of git://github.com/sarjona/moodle
h5p/tests/framework_test.php