| commit | ccd8763ce2782a73cbe5d9ff53b1c9c0a091bb29 | |
| author | Damyon Wiese <damyon@moodle.com> | |
| Thu, 2 May 2013 08:21:55 +0000 (2 16:21 +0800) | ||
| committer | Damyon Wiese <damyon@moodle.com> | |
| Thu, 2 May 2013 08:21:55 +0000 (2 16:21 +0800) | ||
| tree | 29599c3a44eec9e452437a5a6bf94029dba20207 | treesnapshot (tar.gz zip) |
| parent | eb244d3b87eae3b093fcb948978a12ea7c982871 | commitdiff |
| parent | e2bceb5018e584998940713f33c55f1f182065c5 | commitdiff |
Merge branch 'MDL-30775-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE
Conflicts:
course/externallib.php
Conflicts:
course/externallib.php
| course/externallib.php | diff1 | diff2 | blobhistory |