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

Conflicts:
	docs/templates/pages/index.mustache

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

..

pages

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

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

layout.mustache

start wrapping text in {{_i}} for translation

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