| commit | bd633dda9a7ed63ad427761fe3b64d98d2030eba | |
| author | Sam Hemelryk <sam@moodle.com> | |
| Mon, 28 May 2012 20:49:29 +0000 (29 08:49 +1200) | ||
| committer | Sam Hemelryk <sam@moodle.com> | |
| Mon, 28 May 2012 20:49:29 +0000 (29 08:49 +1200) | ||
| tree | c3fa2e62903dd9081cd0d3aa600b2f7f732f87bc | treesnapshot (tar.gz zip) |
| parent | b3520a4ae70571f7fa656f01cbe87c3df4a8a635 | commitdiff |
| parent | 424a19b106003a55d1fbe857a2c66a3ba6450fd3 | commitdiff |
Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle
Conflicts:
lib/db/upgrade.php
version.php
Conflicts:
lib/db/upgrade.php
version.php
| lib/db/upgrade.php | diff1 | diff2 | blobhistory |
| version.php | diff1 | diff2 | blobhistory |