Commit Graph

3 Commits

Author SHA1 Message Date
Mark Otto dae1a68fb1 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-07-09 22:19:23 -07:00
Mark Otto 09762c3f65 rewrite images in markdown 2014-07-09 21:17:22 -07:00
Mark Otto cfc16c94b5 move buttons, helpers, images to markdown 2014-07-09 21:15:57 -07:00