Merge branch 'MDL-68917-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 8 Jun 2020 01:41:27 +0000 (09:41 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 8 Jun 2020 01:41:27 +0000 (09:41 +0800)
1  2 
h5p/classes/helper.php

Simple merge