| commit | bb14cc2d2303f561aafe434d2ef69b0057132cef | |
| author | Dan Poltawski <dan@moodle.com> | |
| Wed, 26 Sep 2012 04:04:41 +0000 (26 12:04 +0800) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Wed, 26 Sep 2012 04:04:41 +0000 (26 12:04 +0800) | ||
| tree | 455bb3a9c1be2619d43bed5595b9bd763f6c84b6 | treesnapshot (tar.gz zip) |
| parent | 4aede312e7c2e9eb59903b10336ea312f4a5bca1 | commitdiff |
| parent | 7dd764b856c4b071f7d19abb86ee68586c99eb8a | commitdiff |
Merge branch 'wip-MDL-15471' of https://github.com/jennymgray/moodle
Conflicts:
lib/db/upgrade.php
version.php
Conflicts:
lib/db/upgrade.php
version.php