Arnold Daniels 176ab8f778 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip ...

Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json

2012-11-29 23:58:46 +01:00

..

example-sites

dat new kippt hotness

2012-09-26 16:01:45 -07:00

examples

add in latest carousel example, reorg examples on getting started

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

bootstrap-mdo-sfmoma-01.jpg

update version # on homepage, crush assets

2012-06-02 22:12:45 -07:00

bootstrap-mdo-sfmoma-02.jpg

update version # on homepage, crush assets

2012-06-02 22:12:45 -07:00

bootstrap-mdo-sfmoma-03.jpg

update version # on homepage, crush assets

2012-06-02 22:12:45 -07:00

bs-docs-bootstrap-features.png

Modified docs with 'Extended by Jasny'

2012-09-05 11:46:06 +02:00

bs-docs-masthead-pattern.png

pngcrush masthead pattern to save 10k

2012-07-17 19:55:02 -07:00

bs-docs-responsive-illustrations.png

Modified docs with 'Extended by Jasny'

2012-09-05 11:46:06 +02:00

bs-docs-twitter-github.png

Modified docs with 'Extended by Jasny'

2012-09-05 11:46:06 +02:00

extended-by-jasny.png

Modified docs with 'Extended by Jasny'

2012-09-05 11:46:06 +02:00

glyphicons-halflings-white.png

fix #3032: update glyphicons sprite to 1.6 release

2012-04-14 16:59:49 -07:00

glyphicons-halflings.png

optimizing images on 2.1.0-wip branch; saving couple of KBs from package

2012-08-06 13:23:12 +03:00

grid-baseline-20px.png

optimizing images on 2.1.0-wip branch; saving couple of KBs from package

2012-08-06 13:23:12 +03:00

jasny-logo-emboss.png

Modified docs with 'Extended by Jasny'

2012-09-05 11:46:06 +02:00

jasny-logo.png

Modified docs with 'Extended by Jasny'

2012-09-05 11:46:06 +02:00

less-logo-large.png

update version # on homepage, crush assets

2012-06-02 22:12:45 -07:00

responsive-illustrations.png

update version # on homepage, crush assets

2012-06-02 22:12:45 -07:00