Mark Otto 5cfde0d3a5 Merge branch 'master' into derp ...

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/javascript/dropdowns.md
	less/utilities.less

2014-07-12 16:15:45 -07:00

..

brand

cleanup svg

2014-03-24 23:57:38 -07:00

css

rearrange a few things; drop compiled theme file

2014-07-11 22:46:10 -07:00

flash

Update ZeroClipboard to v1.3.5.

2014-06-10 08:30:17 +03:00

img

Docs: losslessly compress images.

2014-02-04 11:33:28 +02:00

js

Merge branch 'master' into derp

2014-07-12 16:15:45 -07:00

less

tweak docs sidenav styles

2014-07-11 22:35:07 -07:00