Mark Otto a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip ...

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

2012-07-17 20:57:20 -07:00

..

assets

Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip

2012-07-17 20:57:20 -07:00

build

change title attr to re-include twitter

2012-03-10 15:14:54 -08:00

examples

move navbar and update paths so it sits in tests

2012-05-15 09:45:53 -07:00

templates

Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip

2012-07-17 20:57:20 -07:00

base-css.html

docs cleanup and blockquote cleanup for .pull-right option

2012-07-15 16:13:25 -07:00

components.html

cleanup subnav example

2012-07-13 10:58:20 -07:00

download.html

remove getting started link from home, add to navbar, overhaul getting started docs

2012-07-12 21:38:18 -07:00

examples.html

remove getting started link from home, add to navbar, overhaul getting started docs

2012-07-12 21:38:18 -07:00

extend.html

Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip

2012-07-17 20:57:20 -07:00

getting-started.html

Moved JS to bottom as per best practices

2012-07-13 22:25:47 +01:00

index.html

remove getting started link from home, add to navbar, overhaul getting started docs

2012-07-12 21:38:18 -07:00

javascript.html

remove getting started link from home, add to navbar, overhaul getting started docs

2012-07-12 21:38:18 -07:00

scaffolding.html

docs cleanup and blockquote cleanup for .pull-right option

2012-07-15 16:13:25 -07:00

upgrading.html

remove getting started link from home, add to navbar, overhaul getting started docs

2012-07-12 21:38:18 -07:00