Mark Otto 7e56e2265d Merge branch '2.2.2-wip' into exploratory ...

Conflicts:
	less/button-groups.less

2012-11-22 22:04:21 -08:00

..

assets

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

build

Changing title of docs pages to simply say 'Bootstrap' like the docs home page

2012-10-07 21:38:28 -07:00

examples

add in latest carousel example, reorg examples on getting started

2012-10-16 12:50:10 -05:00

templates

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

base-css.html

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

components.html

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

customize.html

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

extend.html

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

getting-started.html

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

index.html

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

javascript.html

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

scaffolding.html

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00