Dan Poltawski 02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle ... Conflicts: lang/en/moodle.php		2013-11-07 09:34:31 +08:00
..
backup/moodle2	MDL-38792 Update question/type in-line comments to codechecker standards	2013-04-08 19:59:51 -04:00
lang/en	MDL-42728 Merge English strings from the en_fix language pack	2013-11-05 23:41:44 +01:00
pix	MDL-23784 converted question types to use new pix API and locations	2010-08-12 19:01:28 +00:00
tests	MDL-42105 questions: let attempts have a max fraction > 1.	2013-10-04 17:52:19 +01:00
edit_random_form.php	MDL-38792 Update question/type in-line comments to codechecker standards	2013-04-08 19:59:51 -04:00
questiontype.php	MDL-40541 need to be able to select random q	2013-07-23 15:08:32 +08:00
version.php	MDL-42701 Bump all versions near 2.6 release	2013-11-05 02:36:00 +01:00