root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
bootstrap/docs
History
Mark Otto bc0b94a3fd Merge branch 'master' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
 		2012-12-08 17:40:42 -08:00
..
assets Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
build
…
examples Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
templates Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
components.html Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
css.html Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
customize.html Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
extend.html Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
gallery.html Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
getting-started.html Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
index.html Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
javascript.html Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00