mirror of
https://github.com/jasny/bootstrap.git
synced 2026-01-22 20:57:58 -05:00
Conflicts: Makefile README.md component.json docs/assets/css/docs.css docs/assets/img/bs-docs-bootstrap-features.png docs/assets/img/bs-docs-responsive-illustrations.png docs/assets/img/bs-docs-twitter-github.png docs/assets/js/bootstrap-typeahead.js docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/base-css.html docs/components.html docs/customize.html docs/extend.html docs/getting-started.html docs/index.html docs/javascript.html docs/scaffolding.html docs/templates/layout.mustache docs/templates/pages/customize.mustache docs/templates/pages/index.mustache js/bootstrap-typeahead.js package.json