Merge branch 'MDL-63580-master' of git://github.com/cescobedo/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 May 2020 14:32:34 +0000 (22:32 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 May 2020 14:32:34 +0000 (22:32 +0800)
1  2 
h5p/classes/helper.php

Simple merge