Mark Otto e148923f27 Merge branch 'master' of github.com:twbs/bootstrap ...

Conflicts:
	dist/css/bootstrap.min.css

2013-09-19 22:57:11 -05:00

..

css

Massive customizer audit and overhaul

2013-09-11 21:14:10 -07:00

ico

Remove multiple touch icons and roll with a single one

2013-09-10 21:46:12 -07:00

js

Merge branch 'master' of github.com:twbs/bootstrap

2013-09-19 22:57:11 -05:00