Sam Hemelryk 45d011c896 Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle ... Conflicts: theme/base/style/core.css		2012-06-21 09:46:32 +12:00
..
lang/en	theme/base MDL-21862 some docs and a default screenshot (also used for base unfortunately)	2010-04-20 16:46:49 +00:00
layout	MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)	2012-06-18 11:24:04 +08:00
pix	Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle	2012-06-18 16:03:08 +08:00
style	Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle	2012-06-21 09:46:32 +12:00
config.php	Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle	2012-05-28 14:49:12 +12:00
version.php	MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700	2012-06-18 02:37:00 +02:00