| commit | fb032ccb3f4652dc87a7c33fe66a556f31660d83 | |
| author | Dan Poltawski <dan@moodle.com> | |
| Mon, 21 Oct 2013 02:57:44 +0000 (21 10:57 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Mon, 21 Oct 2013 02:57:44 +0000 (21 10:57 +0800) | ||
| tree | 2d6d2d95fc965efb6c7f76172a39e89dfd209dcb | treesnapshot (tar.gz zip) |
| parent | 8173f4cf017dd6c7074ebfe4168d890c6e9e80ef | commitdiff |
| parent | e63515ba9325a8b4c475876d6e7d96fda082c3b1 | commitdiff |
Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle
Conflicts:
lib/upgrade.txt
mod/upgrade.txt
Conflicts:
lib/upgrade.txt
mod/upgrade.txt
| lib/moodlelib.php | diff1 | diff2 | blobhistory |
| mod/assign/locallib.php | diff1 | diff2 | blobhistory |
| mod/assign/tests/locallib_test.php | diff1 | diff2 | blobhistory |
| mod/upgrade.txt | diff1 | diff2 | blobhistory |