projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9c871b cb6782d)
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 02:12:21 +0000 (10:12 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 02:12:21 +0000 (10:12 +0800)
1  2 
mod/scorm/lang/en/scorm.php patch | diff1 | diff2 | blob | history

diff --cc mod/scorm/lang/en/scorm.php
Simple merge
Moodle official production repository