| commit | 3c2e7a0e7cc87b581a051a0356019599d165d19e | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 2 Jul 2013 12:09:11 +0000 (2 14:09 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Tue, 2 Jul 2013 12:09:11 +0000 (2 14:09 +0200) | ||
| tree | 98c446b65172a8edafacf77270fb2f8a903acb70 | treesnapshot (tar.gz zip) |
| parent | 8b180f2317ec65716aa978b1b7864a63186ff057 | commitdiff |
| parent | bfb99cc6198ae2e705f129a0b7c31072f5cb9d11 | commitdiff |
Merge branch 'MDL-34472-master' of git://github.com/ankitagarwal/moodle
Conflicts:
lib/upgrade.txt
Conflicts:
lib/upgrade.txt
| lib/upgrade.txt | diff1 | diff2 | blobhistory |