Sam Hemelryk 49eef7d82d Merge branch 'wip-MDL-40204_master' of git://github.com/gjb2048/moodle ...

Conflicts:
	theme/bootstrapbase/style/moodle.css

2013-06-25 11:35:57 +12:00

..

columns1.php

MDL-40065 theme_bootstrapbase theme_clean: Simplify column lyts / fix blocks.

2013-06-24 17:06:12 +01:00

columns2.php

MDL-40065 theme_bootstrapbase theme_clean: Simplify column lyts / fix blocks.

2013-06-24 17:06:12 +01:00

columns3.php

Merge branch 'wip-MDL-40204_master' of git://github.com/gjb2048/moodle

2013-06-25 11:35:57 +12:00

embedded.php

MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods.

2013-06-07 17:32:44 +12:00

secure.php

MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods.

2013-06-07 17:32:44 +12:00