Dan Poltawski dbfdd1a4f9 Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-13 12:34:53 +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.