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

Conflicts:
	docs/assets/bootstrap.zip

2012-04-14 17:16:37 -07:00

..

css

adding icon classes to finish off glyphicons 1.6 update

2012-04-14 17:15:16 -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

hack for subnav

2012-04-14 17:15:03 -07:00

bootstrap.zip

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

2012-04-14 17:16:37 -07:00