Mark Otto 8551f42ae2 Merge branch 'master' into pr/12412 ...

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json

2014-02-11 09:50:40 -08:00

..

_data

i'm an idiot

2014-02-08 22:46:25 -08:00

_includes

http://www.youtube.com/watch?v=YQwYNca4iog

2014-02-10 20:52:20 -08:00

_layouts

Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-

2014-02-08 23:24:38 -08:00

assets

Merge branch 'master' into pr/12412

2014-02-11 09:50:40 -08:00

dist

Merge branch 'master' into pr/12412

2014-02-11 09:50:40 -08:00

examples

Merge branch 'pr/12579'

2014-02-08 15:53:18 -08:00

jade

Move jade files to docs/jade/

2014-02-08 22:29:06 +01:00

about.html

Merge pull request #12665 from twbs/docs_teams

2014-02-10 19:19:52 -08:00

components.html

consistency

2014-02-07 01:31:42 -08:00

css.html

Mention limitation of form validation feedback icons with input groups

2014-02-08 17:19:45 -08:00

customize.html

Fix #10348: Customizer dependencies

2014-01-25 12:35:46 +00:00

getting-started.html

add version to getting started page

2014-02-10 22:12:28 -08:00

index.html

Fixes #12685: Display current version under download button on homepage

2014-02-10 20:23:29 -08:00

javascript.html

tweak phrasing for hopefully greater clarity

2014-02-10 10:12:28 -08:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

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

migration.html

fix #12494 in the migration docs

2014-02-03 23:05:51 -08:00