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

..

buttons.md

rewrite helpers in markdown

2014-07-09 21:17:10 -07:00

code.html

Docs: add missing example code code for kbd after #13351.

2014-07-05 15:51:03 +03:00

forms.html

.btn-default to .btn-secondary

2014-07-08 17:14:14 -07:00

grid.md

Rewrite grid docs in markdown

2014-07-09 22:00:07 -07:00

helpers.md

rewrite helpers in markdown

2014-07-09 21:17:10 -07:00

images.md

Merge branch 'master' into derp

2014-07-09 22:19:23 -07:00

overview.md

rewrite overview in markdown

2014-07-09 21:35:27 -07:00

responsive-utilities.html

remove deprecated warnings from docs

2014-07-09 13:51:20 -07:00

tables.html

clarify

2014-05-22 21:39:47 -07:00

type.html

Add dropped text-justify

2014-06-11 17:39:02 +02:00