Arnold Daniels 176ab8f778 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip ...

Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	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/index.mustache
	js/bootstrap-typeahead.js
	package.json

2012-11-29 23:58:46 +01:00

..

assets

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

build

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

examples

add in latest carousel example, reorg examples on getting started

2012-10-16 12:50:10 -05:00

templates

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

base-css.html

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

components.html

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

customize.html

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

extend.html

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

getting-started.html

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

index.html

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

javascript.html

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00

scaffolding.html

Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip

2012-11-29 23:58:46 +01:00