Mark Otto 0a2ec5545b Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master ...

Conflicts:
	dist/css/bootstrap.min.css

2013-08-23 23:16:37 -07:00

..

css

Update and document use of small in headings

2013-08-23 14:22:51 -07:00

ico

fix 144 apple icon

2013-08-19 09:54:16 -07:00

js

Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master

2013-08-23 23:16:37 -07:00