Merge branch 'scorm-task' of https://github.com/GanitGenius/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Apr 2017 00:02:03 +0000 (02:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Apr 2017 00:02:03 +0000 (02:02 +0200)
1  2 
mod/scorm/lang/en/scorm.php
mod/scorm/lib.php

Simple merge
Simple merge