fat a4c16155a2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip ...

Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html

2013-05-16 11:08:46 -07:00

..

_includes

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

2013-05-16 11:08:46 -07:00

_layouts

redo docs footer a bit

2013-05-09 17:36:02 -07:00

_site

a bunch javascript junk

2013-05-16 11:06:30 -07:00

assets

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

2013-05-16 11:08:46 -07:00

examples

Fix buttons within examples

2013-05-12 22:04:22 -04:00

components.html

Fixes #7898: ensure button type

2013-05-15 10:01:09 -07:00

css.html

Fixes #7898: ensure button type

2013-05-15 10:01:09 -07:00

customize.html

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

2013-05-16 11:08:46 -07:00

docs.html

a bunch javascript junk

2013-05-16 11:06:30 -07:00

getting-started.html

outdent the file list

2013-05-14 22:00:08 -07:00

index.html

Fix link to examples

2013-05-10 07:37:14 -04:00

javascript.html

fix broke example

2013-05-12 16:13:39 -07:00