Mark Otto 4ccf088a24 Merge branch 'master' into pr/12813 ...

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

2014-02-22 12:20:53 -08:00

..

_data

update homepage showcase with three new posts

2014-02-13 01:21:35 -08:00

_includes

Fixes #12744: Document ability to remove animation on modals

2014-02-21 14:52:15 -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/12813

2014-02-22 12:20:53 -08:00

dist

Merge branch 'master' into pr/12813

2014-02-22 12:20:53 -08:00

examples

Fixes #12735: Fix sidebar hover state in Dashboard example

2014-02-21 15:06:21 -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

Merge pull request #12809 from Borkason/patch-1

2014-02-21 17:18:50 -08:00

customize.html

Fix #10348: Customizer dependencies

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

getting-started.html

change translation docs in light of #11342 & its many dupes

2014-02-19 11:27:16 -08:00

index.html

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

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

javascript.html

Fixes #12744: Document ability to remove animation on modals

2014-02-21 14:52:15 -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