theme/bootstrapbase/README.txt · d15809bb81775270b120dc389ebdc41f7abe8bd1 · Chris Lewis / moodle

Apr 26, 2013

Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle · a86103e0

Eloy Lafuente (stronk7) authored Apr 26, 2013

Conflicts:
	theme/bootstrap/style/generated.css
	theme/bootstrap/style/moodle.css
	theme/bootstrapbase/less/moodle/recess.txt
	theme/bootstrapbase/style/generated.css

a86103e0

Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle

Eloy Lafuente (stronk7) authored Apr 26, 2013

Conflicts:
	theme/bootstrap/style/generated.css
	theme/bootstrap/style/moodle.css
	theme/bootstrapbase/less/moodle/recess.txt
	theme/bootstrapbase/style/generated.css