Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle
commit7a2121d7f2847b694035668f1115786595d2326e
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 04:19:13 +0000 (31 12:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 04:19:13 +0000 (31 12:19 +0800)
treedce31952701cb4b77994e4cc0f10c5b1662fe7f5
parentca12fb5458be2325d5d4e0b376c5c16c5f1ba978
parentc178ba727505c99c14d180095a811da5865fd072
Merge branch 'wip-MDL-57785-master' of git://github.com/amygroshek/moodle
mod/scorm/datamodels/scorm_12.js