Mark Otto 1bf1ba7103 Merge branch 'master' into pr/15278 ...

Conflicts:
	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.css.map
	docs/dist/css/bootstrap.min.css

2015-01-18 12:24:29 -08:00

..

_data

#15576 errata: #15298 also reproduces on Linux

2015-01-16 15:16:52 -08:00

_includes

Merge pull request #15581 from twbs/inline-form-with-visible-labels

2015-01-16 08:20:41 -08:00

_jade

Tie help block to input with aria-describedby

2014-12-09 09:57:35 +00:00

_layouts

Make skip link look less "bare bones"

2014-12-14 21:27:58 +00:00

_plugins

Use a Jekyll plugin instead of the copy:configBridge grunt task

2014-11-05 18:35:13 +01:00

assets

Merge branch 'master' into pr/15278

2015-01-18 12:24:29 -08:00

dist

Merge branch 'master' into pr/15278

2015-01-18 12:24:29 -08:00

examples

Update jQuery to v1.11.2.

2015-01-07 00:31:18 +02:00

about.html

Specify img dimensions in the HTML.

2014-12-11 08:14:07 +02:00

apple-touch-icon.png

Losslessly compress apple-touch-icon.png.

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

browser-bugs.html

Use Jekyll data for Wall of Browser Bugs

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

components.html

Added/removed blank lines in the docs for consitency

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

css.html

Added/removed blank lines in the docs for consitency

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

customize.html

Use a glyphicon instead of the unicode character.

2014-12-30 09:56:24 +02:00

favicon.ico

Fix favicon.ico after d763b0fe5b5d83025b94212638b1bd5500c43c71.

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

getting-started.html

Added/removed blank lines in the docs for consitency

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

index.html

Added/removed blank lines in the docs for consitency

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

javascript.html

Added/removed blank lines in the docs for consitency

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

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

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

migration.html

Added/removed blank lines in the docs for consitency

2014-10-22 13:52:49 +02: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