Sam Hemelryk 1924a86afa Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution

2011-08-29 12:13:40 +12:00

..

embedded.php

MDL-28929 update all themes to use the new placeholders

2011-08-21 21:01:53 +02:00

frontpage.php

Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution

2011-08-29 12:13:40 +12:00

general.php

Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution

2011-08-29 12:13:40 +12:00