0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Bootstrap/docs
Mark Otto 4d73aa60f9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-17 23:34:31 -07:00
..
_includes remove colophon include because there's only one layout using it now 2013-07-17 21:02:50 -07:00
_layouts remove colophon include because there's only one layout using it now 2013-07-17 21:02:50 -07:00
assets Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:34:31 -07:00
components.html fix broken docs callouts 2013-07-17 20:17:56 -07:00
css.html fix link to grid example 2013-07-17 21:04:27 -07:00
customize.html Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam 2013-07-17 19:33:30 -07:00
getting-started.html Merge branch '3.0.0-wip' into bs3_remove_examples 2013-07-17 20:44:27 -07:00
index.html Merge branch '3.0.0-wip' into bs3_remove_examples 2013-07-17 20:44:27 -07:00
javascript.html fix broken docs callouts 2013-07-17 20:17:56 -07:00