Jacob Thornton 0de951f4f4 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip ...

Conflicts:
	docs/assets/bootstrap.zip

2012-01-29 19:07:14 -08:00

..

assets

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

2012-01-29 19:07:14 -08:00

build

add missing paren

2012-01-27 14:44:05 -08:00

templates

remove .collapse from navbar responsive docs

2012-01-29 16:54:51 -08:00

base-css.html

fix broken navbar collapse

2012-01-29 16:35:55 -08:00

components.html

remove .collapse from navbar responsive docs

2012-01-29 16:54:51 -08:00

download.html

fix broken navbar collapse

2012-01-29 16:35:55 -08:00

examples.html

fix broken navbar collapse

2012-01-29 16:35:55 -08:00

index.html

fix broken navbar collapse

2012-01-29 16:35:55 -08:00

javascript.html

fix broken navbar collapse

2012-01-29 16:35:55 -08:00

less.html

fix broken navbar collapse

2012-01-29 16:35:55 -08:00

scaffolding.html

fix broken navbar collapse

2012-01-29 16:35:55 -08:00

upgrading.html

fix broken navbar collapse

2012-01-29 16:35:55 -08:00