Mark Otto 2dbce887df Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip ...

Conflicts:
	docs/assets/bootstrap.zip

2012-04-14 23:07:51 -07:00

..

css

ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous

2012-04-14 23:06:00 -07:00

ico

adding 144x144 ipad touch icon

2012-03-25 00:46:03 -07:00

img

fix #3032: update glyphicons sprite to 1.6 release

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

js

change position of var in dropdown + cleanup makefile vars

2012-04-14 22:43:36 -07:00

bootstrap.zip

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

2012-04-14 23:07:51 -07:00