0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Bootstrap/docs
Mark Otto 51b1a027da Merge branch 'bs3-input-groups' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
..
assets Merge branch 'bs3-input-groups' into 3.0.0-wip 2012-12-19 21:02:54 -08:00
build Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
examples Merge branch '2.2.2-wip' into 3.0.0-wip 2012-12-05 11:05:10 -08:00
templates Merge branch 'bs3-input-groups' into 3.0.0-wip 2012-12-19 21:02:54 -08:00
components.html Merge branch 'master' into 3.0.0-wip 2012-12-08 17:40:42 -08:00
css.html Merge branch 'bs3-input-groups' into 3.0.0-wip 2012-12-19 21:02:54 -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 conflicts 2012-12-08 22:45:39 -08:00