Mark Otto 4fc2907723 Merge branch 'master' into docs_derp ...

Conflicts:
	docs-assets/css/docs.css
	docs-assets/js/application.js

2013-12-11 22:39:03 -08:00

..

css

Merge branch 'master' into docs_derp

2013-12-11 22:39:03 -08:00

ico

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

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

img

more homepage and sidenav overhaul

2013-12-11 22:37:59 -08:00

js

Merge branch 'master' into docs_derp

2013-12-11 22:39:03 -08:00