| commit | 4f0eaf18f42a9ff8e11118b7f04195479ba10169 | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 8 Oct 2013 08:42:17 +0000 (8 16:42 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 8 Oct 2013 08:42:17 +0000 (8 16:42 +0800) | ||
| tree | 0aae086fdd304c0f78e2399dfa365fd11c141cd4 | treesnapshot (tar.gz zip) |
| parent | 7bfc69b0c2d15b38c0e962d64d8653528fc79339 | commitdiff |
| parent | 3d27180e94903c86201195bf6f9194333d56e9be | commitdiff |
Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php