Mark Otto 91e9f6fa91 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip ...

Conflicts:
	docs/assets/css/bootstrap.css

2012-01-27 14:49:02 -08:00

..

assets

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

2012-01-27 14:49:02 -08:00

build

add missing paren

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

templates

update the docs for icons

2012-01-27 13:56:50 -08:00

base-css.html

update the docs for icons

2012-01-27 13:56:50 -08:00

components.html

rebuil update layout

2012-01-27 13:36:31 -08:00

download.html

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

2012-01-27 13:37:14 -08:00

examples.html

rebuil update layout

2012-01-27 13:36:31 -08:00

index.html

rebuil update layout

2012-01-27 13:36:31 -08:00

javascript.html

rebuil update layout

2012-01-27 13:36:31 -08:00

less.html

rebuil update layout

2012-01-27 13:36:31 -08:00

scaffolding.html

rebuil update layout

2012-01-27 13:36:31 -08:00

upgrading.html

rebuil update layout

2012-01-27 13:36:31 -08:00