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

Conflicts:
	docs/templates/pages/index.mustache

2012-01-24 14:28:14 -08:00

..

assets

docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark

2012-01-24 14:25:30 -08:00

build

start wrapping text in {{_i}} for translation

2012-01-23 19:55:00 -08:00

templates

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

2012-01-24 14:28:14 -08:00

base-css.html

docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark

2012-01-24 14:25:30 -08:00

components.html

docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark

2012-01-24 14:25:30 -08:00

index.html

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

2012-01-24 14:28:14 -08:00

javascript.html

docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark

2012-01-24 14:25:30 -08:00

less.html

docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark

2012-01-24 14:25:30 -08:00

scaffolding.html

start wrapping text in {{_i}} for translation

2012-01-23 19:55:00 -08:00

upgrading.html

start wrapping text in {{_i}} for translation

2012-01-23 19:55:00 -08:00