Eloy Lafuente (stronk7) 58c9faeaca Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle ... Conflicts: theme/base/style/core.css theme/bootstrapbase/style/moodle.css		2013-09-17 19:59:55 +02:00
..
lang/en	Fixing readme MDL-22875	2010-06-25 05:13:37 +00:00
layout	MDL-36048 Allow course formats to add course headers and footers	2012-11-10 15:39:01 +08:00
style	Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle	2013-09-17 19:59:55 +02:00
config.php	MDL-39174 fix phpdocs packages in themes	2013-04-27 13:22:59 +02:00
version.php	MDL-39434 Bump all versions near 2.5 release	2013-05-01 18:03:29 +02:00