Eloy Lafuente (stronk7) 33b9fecd19 Merge branch 'wip-MDL-39836_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-28 01:23:27 +02:00
..

These css files are created from .less files via the method described in the readme
in the /theme/bootstrap/less/ folder. It's unwise to directly the edit the css files as your changes
may be overwritten.