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

..

_data

fix js nav

2014-07-12 02:34:04 -07:00

_includes

Merge branch 'master' into derp

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

_jade

Fix #13138: use underscore prefix to ignore directories

2014-03-24 21:47:59 +01:00

_layouts

restore docs and homepage navs

2014-07-12 02:25:07 -07:00

_plugins

plugins: add new example doodad hackery bullshitery and markdown block plugin for markdown includes

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

assets

Merge branch 'master' into derp

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

components

move responsive embed

2014-07-12 02:13:32 -07:00

dist

Merge branch 'master' into derp

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

examples

Merge branch 'master' into derp

2014-07-11 00:38:28 -07:00

getting-started

markdown for 3rd party

2014-07-12 02:06:18 -07:00

javascript

Merge branch 'master' into derp

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

layout

make it a thing

2014-07-11 23:19:46 -07:00

about.html

add svg logos to brand guidelines

2014-03-04 13:32:02 -08:00

apple-touch-icon-precomposed.png

Losslessly compress apple-touch-icon-precomposed.png.

2014-06-09 01:15:08 +03:00

browser-bugs.html

Add Wall of Browser Bugs entry for #13892

2014-07-03 17:17:18 -07:00

customize.html

.btn-default to .btn-secondary

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

favicon.ico

Fix favicon.ico after d763b0fe5b5d83025b94212638b1bd5500c43c71.

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

index.html

Docs: Refactor to use .less file instead, importing Bootstrap vars and mixins, and cleaning all the things up

2014-07-09 02:40:05 -07:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

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

robots.txt

Add sitemap.xml and robots.txt files.

2014-02-27 17:05:52 +02:00

sitemap.xml

Add missing blank line

2014-03-15 22:40:51 +01:00