Mark Otto 12c619f5b9 Merge branch 'master' into boulox-responsive-embed ...

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

2014-03-06 22:40:25 -08:00

..

_data

update homepage showcase with three new posts

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

_includes

Merge branch 'master' into boulox-responsive-embed

2014-03-06 22:40:25 -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 boulox-responsive-embed

2014-03-06 22:40:25 -08:00

dist

Merge branch 'master' into boulox-responsive-embed

2014-03-06 22:40:25 -08:00

examples

Merge pull request #12894 from lipis/patch-2

2014-03-06 21:11:00 -08:00

jade

Move jade files to docs/jade/

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

about.html

add svg logos to brand guidelines

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

browser-bugs.html

add docs page listing relevant outstanding browser bugs

2014-03-06 15:19:27 -08:00

components.html

Rewrite the disabled list group items to simplify styles

2014-03-06 21:40:22 -08:00

css.html

Merge branch 'master' into boulox-responsive-embed

2014-03-06 22:40:25 -08:00

customize.html

Fix #10348: Customizer dependencies

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

getting-started.html

add link from Getting Started page to Wall of Browser Bugs page

2014-03-06 15:19:27 -08:00

index.html

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

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

javascript.html

Fix small typo in JavaScript docs

2014-02-28 20:11:02 +01:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

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

migration.html

add data-toggle button.js change to migration docs

2014-03-03 14:42:39 -08:00

robots.txt

Add sitemap.xml and robots.txt files.

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

sitemap.xml

Add sitemap.xml and robots.txt files.

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