Aparup Banerjee 37240ce5c6 Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle ...

Conflicts:
	version.php

2013-04-04 15:07:01 +08:00

..

db

MDL-37032 upgrade: define all the 2.4.0 points

2012-12-11 13:11:11 +01:00

lang/en

MDL-38424 theme_formal_white: added suggestions to css custom styles description

2013-03-12 13:45:08 +01:00

layout

MDL-36339 Modify themes to add course headers and footers provided by course format

2012-12-10 12:14:57 +08:00

pix

MDL-27588 Fixed up several bugs with the formal_white theme

2011-06-08 13:17:06 +08:00

style

Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle

2013-04-04 15:07:01 +08:00

config.php

MDL-36339 Modify themes to add course headers and footers provided by course format

2012-12-10 12:14:57 +08:00

lib.php

MDL-38052 theme_formal_white: allowed the overlap between headermenu and header logo

2013-02-21 18:11:32 +01:00

settings.php

MDL-34916 theme_formal_white: added support for relative path of logos

2012-09-04 09:52:13 +02:00

version.php

MDL-36933 Bump everything to 2012112900

2012-11-30 03:30:09 +01:00