Mark Otto 2cc66cbb58 Merge branch 'master' into derp ...

Conflicts:
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/_variables.less

2014-11-09 23:48:56 -08:00

..

_data

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

_includes

Merge branch 'master' into derp

2014-11-09 23:48:56 -08:00

_jade

.bs-customizer-input => .col-xs-4

2014-10-27 15:02:21 -07:00

_layouts

Use Jekyll data for Wall of Browser Bugs

2014-11-04 07:25:52 +01:00

_plugins

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

about

move license and translations to about section

2014-08-05 17:19:12 -07:00

assets

Merge branch 'master' into derp

2014-11-09 23:48:56 -08:00

components

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

dist

Merge branch 'master' into derp

2014-11-09 23:48:56 -08:00

examples

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

getting-started

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

javascript

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

layout

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

apple-touch-icon.png

Losslessly compress apple-touch-icon.png.

2014-10-26 08:08:33 +02:00

browser-bugs.md

Merge branch 'master' into derp

2014-11-09 22:02:53 -08:00

customize.html

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

favicon.ico

Fix favicon.ico after d763b0fe5b5d83025b94212638b1bd5500c43c71.

2014-06-09 11:13:24 +03:00

index.html

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

2014-01-14 13:47:18 +01:00

robots.txt

Remove layout: nil.

2014-08-01 19:45:11 +03:00

sitemap.xml

Added/removed blank lines in the docs for consitency

2014-10-22 13:52:49 +02:00