Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts: Makefile docs/_site/assets/js/bootstrap-typeahead.js docs/assets/js/bootstrap.min.js docs/customize.html docs/docs.html
Showing
docs/_includes/nav-css.html
0 → 100644
docs/_includes/nav-main.html
0 → 100644
docs/_layouts/customize.html
0 → 100644
docs/components.html
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/css.html
0 → 100644
docs/getting-started.html
0 → 100644
docs/javascript.html
0 → 100644
Please register or sign in to comment