| commit | 03138971086260f4ef55f8a80574924736e27147 | |
| author | Marina Glancy <marina@moodle.com> | |
| Wed, 4 Jun 2014 02:07:03 +0000 (4 10:07 +0800) | ||
| committer | Marina Glancy <marina@moodle.com> | |
| Wed, 4 Jun 2014 02:07:03 +0000 (4 10:07 +0800) | ||
| tree | 0eaa039e8709e41928e67d0f70ffa24a5f352cb6 | treesnapshot (tar.gz zip) |
| parent | 0591c2056d315f8445334ada4bed261ca1d3eafb | commitdiff |
| parent | 1bce3a70d9852b65f3ff29be5361b57c6c18ff4e | commitdiff |
Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle
Conflicts:
lib/phpunit/bootstrap.php
Conflicts:
lib/phpunit/bootstrap.php
| lib/phpunit/bootstrap.php | diff1 | diff2 | blobhistory |