Jacob Thornton 0bfbe5058d Merge branch '2.0-wip' ... Conflicts: .gitignore LICENSE Makefile bootstrap.css bootstrap.min.css docs/assets/js/application.js docs/assets/js/google-code-prettify/prettify.css docs/index.html docs/javascript.html examples/container-app.html examples/fluid.html examples/hero.html js/bootstrap-alerts.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tabs.js js/bootstrap-twipsy.js js/tests/index.html js/tests/unit/bootstrap-modal.js js/tests/unit/bootstrap-popover.js js/tests/unit/bootstrap-tabs.js lib/forms.less lib/mixins.less lib/patterns.less lib/scaffolding.less lib/tables.less		2012-01-31 13:18:34 -08:00
..
node_modules	Merge branch '2.0-wip'	2012-01-31 13:18:34 -08:00
index.js	add missing paren	2012-01-27 14:44:05 -08:00
package.json	add templates for doc generation	2012-01-23 14:14:16 -08:00