| commit | 4efcfaa3aec5d7ff6398b1e69278b5a48cbf1904 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 26 Mar 2013 22:04:48 +0000 (26 23:04 +0100) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 26 Mar 2013 22:04:48 +0000 (26 23:04 +0100) | ||
| tree | beb65cc68ff224601367fbcab6d2600184ba91a2 | treesnapshot (tar.gz zip) |
| parent | 2ac738f8ede52de7b642b13eff01ea5f328a0854 | commitdiff |
| parent | e78833978615b2ca500367a6c23a74c657cdeac1 | commitdiff |
Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle
Conflicts:
lib/upgrade.txt
Conflicts:
lib/upgrade.txt
| cohort/lib.php | diff1 | diff2 | blobhistory |
| lib/datalib.php | diff1 | diff2 | blobhistory |
| lib/upgrade.txt | diff1 | diff2 | blobhistory |