Merge branch 'MDL-58369-master' of git://github.com/damyon/moodle
authorDavid Monllao <david.monllao@gmail.com>
Thu, 6 Apr 2017 06:59:21 +0000 (08:59 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Thu, 6 Apr 2017 06:59:21 +0000 (08:59 +0200)
1  2 
mod/scorm/lib.php

Simple merge