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

..

lang/en

MDL-42728 Merge English strings from the en_fix language pack

2013-11-05 23:41:44 +01:00

tests

…

lib.php

…

settings_form.php

MDL-39059 Set explicit boolean type of a hidden field in workshop random allocator form

2013-04-09 21:46:18 +02:00

settings.php

…

styles.css

…

version.php

MDL-42701 Bump all versions near 2.6 release

2013-11-05 02:36:00 +01:00