2 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
a86103e09b Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrap/style/generated.css
	theme/bootstrap/style/moodle.css
	theme/bootstrapbase/less/moodle/recess.txt
	theme/bootstrapbase/style/generated.css
2013-04-26 11:10:09 +02:00
Damyon Wiese
4f1008202d MDL-39341 Themes Rename bootstrap to bootstrapbase 2013-04-26 13:01:06 +08:00