| commit | a831f154aed9764d50d2273360a99a12587f9ca6 | |
| author | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 17 Jun 2013 22:44:17 +0000 (18 00:44 +0200) | ||
| committer | Eloy Lafuente (stronk7) <stronk7@moodle.org> | |
| Mon, 17 Jun 2013 22:44:17 +0000 (18 00:44 +0200) | ||
| tree | 9ef9499826dac7cf090498781fca9a586d2ea9a3 | treesnapshot (tar.gz zip) |
| parent | 54c7d518f3f9fd0e0fb9b82608abf7ba09c4b88e | commitdiff |
| parent | 068373c86ac19d12da7944efa44ab107689741de | commitdiff |
Merge branch 'MDL-33562-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
Conflicts:
lib/db/upgrade.php
version.php
Conflicts:
lib/db/upgrade.php
version.php
| lib/db/upgrade.php | diff1 | diff2 | blobhistory |
| lib/moodlelib.php | diff1 | diff2 | blobhistory |
| version.php | diff1 | diff2 | blobhistory |