Merge branch 'MDL-63148-master' of git://github.com/peterRd/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Feb 2019 12:28:21 +0000 (13:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Feb 2019 12:28:21 +0000 (13:28 +0100)
1  2 
mod/scorm/lib.php

Simple merge