Merge branch 'MDL-50861-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 21:51:22 +0000 (10:51 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 21:51:22 +0000 (10:51 +1300)
1  2 
mod/scorm/player.php

Simple merge