Damyon Wiese 4a813f3959 Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle ... Conflicts: lib/db/install.xml lib/db/upgrade.php version.php		2014-10-07 12:34:34 +08:00
..
classes	MDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant	2014-10-06 17:31:15 +13:00
generator	MDL-36014 cohorts: Allow teachers to view cohorts	2014-10-03 18:26:34 +08:00
tests	MDL-47398 core_grades: fix grade category generator	2014-09-26 09:57:56 +08:00
lib.php	MDL-43461 testing: Avoid switching to .bat files when running MinGW	2014-01-14 13:11:07 +08:00