Damyon Wiese d523d161fe Merge branch 'wip-MDL-39064-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrap/style/generated.css
2013-04-16 16:56:09 +08:00
..

The generated.css file is created from .less files via the method described in the readme
in the /less/ folder. It's unwise to directly the edit the generated.css as your changes
may be overwritten.