Mark Otto 080aa7f5c8 Merge branch 'master' into pr/11299 ...

Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js

2013-11-30 00:55:00 -08:00

..

css

Corrected color contrast to WCAG 2.0 AA

2013-11-09 13:03:21 -05:00

ico

move /assets/ to /docs-assets/ ; fixes #10715

2013-09-23 13:02:26 -07:00

js

Merge branch 'master' into pr/11299

2013-11-30 00:55:00 -08:00