Sam Hemelryk bb0eaec490 Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle ... Conflicts: theme/magazine/config.php		2012-05-28 14:49:12 +12:00
..
db	MDL-30610 remove outdated theme upgrade code	2011-12-23 10:38:13 +01:00
lang/en	MDL-32578 theme_formal_white: modified two lang strings	2012-04-23 15:20:34 +08:00
layout	MDL-29127 theme_formalwhite: highlight for unread forum post	2012-03-05 12:38:12 +13:00
pix	MDL-27588 Fixed up several bugs with the formal_white theme	2011-06-08 13:17:06 +08:00
style	Merge branch 'MDL-32380_master' of git://github.com/kordan/moodle	2012-05-28 14:03:20 +12:00
config.php	Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle	2012-05-28 14:49:12 +12:00
lib.php	MDL-32566 theme_formal_white: restyling of login block	2012-04-23 15:13:13 +02:00
settings.php	MDL-32578 theme_formal_white: modified two lang strings	2012-04-23 15:20:34 +08:00
version.php	MDL-32356 theme_formal_white: added blockpadding setting	2012-04-06 10:05:59 +02:00