Damyon Wiese c8f7f2b5f3 Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-09 11:29:33 +08: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.