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

Conflicts:
	bootstrap.css

2012-01-25 11:27:29 -08:00

..

assets

updated icons to require a base class .icon

2012-01-25 09:51:03 -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-25 11:27:29 -08:00

base-css.html

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

2012-01-25 11:27:29 -08:00

components.html

rebuild + add spy to template

2012-01-25 11:25:35 -08:00

download.html

rebuild + add spy to template

2012-01-25 11:25:35 -08:00

examples.html

rebuild + add spy to template

2012-01-25 11:25:35 -08:00

index.html

rebuild + add spy to template

2012-01-25 11:25:35 -08:00

javascript.html

rebuild + add spy to template

2012-01-25 11:25:35 -08:00

less.html

rebuild + add spy to template

2012-01-25 11:25:35 -08:00

scaffolding.html

rebuild + add spy to template

2012-01-25 11:25:35 -08:00

upgrading.html

rebuild + add spy to template

2012-01-25 11:25:35 -08:00