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

Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache

2012-01-24 16:09:32 -08:00

..

base-css.mustache

Final translation tags in Base CSS

2012-01-24 22:17:32 +01:00

components.mustache

rebuild

2012-01-24 15:42:16 -08:00

index.mustache

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

2012-01-24 16:09:32 -08:00

javascript.mustache

typo with i18n

2012-01-24 15:51:28 -08:00

less.mustache

fix broken index page heading, update variables and less pages

2012-01-24 16:07:30 -08:00

scaffolding.mustache

scaffolding i18n

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

upgrading.mustache

add i18n to upgrading

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