1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
twbs--bootstrap/docs/assets
Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
2012-12-05 11:05:10 -08:00
..
css Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
fonts removing glyphicons images, swapping in new icon font with new classes 2012-11-02 01:20:06 -07:00
ico fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
img add gallery page, fill with a few screenshots to start 2012-12-04 20:30:21 -08:00
js Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00