Merge branch 'master_MDL-46903' of https://github.com/danmarsden/moodle
commite1074d6ffd49f3770d4d8e65959525fb7cf871c7
authorDavid Monllao <davidm@moodle.com>
Fri, 4 Nov 2016 00:24:43 +0000 (4 08:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 4 Nov 2016 00:24:43 +0000 (4 08:24 +0800)
treebe00bbcccfe10dfb04f80a2ea5a15336bce8d81a
parent8b0064d5e774279945308a8a3ec3a5cb6783a3fa
parenta2096721c7c8db7df858ec3880b106e58302843d
Merge branch 'master_MDL-46903' of https://github.com/danmarsden/moodle
mod/scorm/report/objectives/classes/report.php