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

Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache

2012-07-24 00:24:25 -07:00

..

assets

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

2012-07-24 00:24:25 -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/twitter/bootstrap into 2.1.0-wip

2012-07-24 00:24:25 -07:00

base-css.html

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

2012-07-23 23:01:38 -07:00

components.html

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

2012-07-23 23:01:38 -07:00

customize.html

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

2012-07-23 23:01:38 -07:00

extend.html

some progress on affix plugin

2012-07-22 18:28:39 -07:00

getting-started.html

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

2012-07-23 23:01:38 -07:00

index.html

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

2012-07-23 23:01:38 -07:00

javascript.html

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

2012-07-24 00:24:25 -07:00

scaffolding.html

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

2012-07-23 23:01:38 -07:00

upgrading.html

some progress on affix plugin

2012-07-22 18:28:39 -07:00