| commit | 9ff2a265d01f62a2d78e0cbd7a25065957645152 | |
| author | David Monllao <davidm@moodle.com> | |
| Tue, 15 Sep 2015 01:58:08 +0000 (15 09:58 +0800) | ||
| committer | David Monllao <davidm@moodle.com> | |
| Tue, 15 Sep 2015 01:58:08 +0000 (15 09:58 +0800) | ||
| tree | 10d9800c1bb356077deb767d90518cd4cb29b3ea | treesnapshot (tar.gz zip) |
| parent | 0b90eb615528a7b43f862b837d85f758af846a73 | commitdiff |
| parent | 32c114ca04e748d2b4603548e52fba2bb5af998f | commitdiff |
Merge branch 'm30_MDL-51363_Fix_Default_Settings_1x_Restore' of git://github.com/scara/moodle
Conflicts:
mod/scorm/version.php
Conflicts:
mod/scorm/version.php