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

..

lang/en

MDL-38352 Merge English strings from the en_fix language pack

2013-03-06 16:44:39 +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

adding core theme magazine. MDL-23620

2010-08-02 19:09:55 +00:00

pix_core

adding core theme magazine. MDL-23620

2010-08-02 19:09:55 +00: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

adding core theme magazine. MDL-23620

2010-08-02 19:09:55 +00:00

settings.php

Fix settings pages for Brick, Fusion, Magazine, Overlay, Sky_high, and Splash, MDL-22874

2010-08-19 15:23:01 +00:00

version.php

MDL-36933 Bump everything to 2012112900

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