Mark Otto b93ce03f19 Merge branch 'master' of github.com:twbs/bootstrap ...

Conflicts:
	docs/assets/js/customize.min.js

2014-01-14 21:45:10 -08:00

..

_data

Rearrange repository contents because muahahahahahaha

2013-12-28 22:47:03 -08:00

_includes

Link the blog post instead of main blog page

2014-01-14 14:40:27 +01:00

_layouts

harmonize footer links on homepage & docs pages

2014-01-05 13:45:56 -08:00

assets

revert unnecessary customizations of Blob.js & FileSaver.js

2014-01-14 20:46:25 -08:00

dist

Fixes #12210: badges in xs buttons

2014-01-14 21:44:38 -08:00

examples

Update copyright notices in all places

2014-01-07 01:05:24 +01:00

grunt

add missing semicolon

2014-01-14 14:25:25 -08:00

about.html

Fix typo

2014-01-04 21:35:06 -08:00

components.html

refer to correct component

2014-01-10 18:56:39 -08:00

css.html

use height adjectives for greater clarity

2014-01-10 15:33:04 -08:00

customize.html

Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095

2014-01-08 12:41:51 -08:00

customizer-variables.jade

add support for '//===' for <h3>s in bs-lessdoc

2014-01-08 12:41:51 -08:00

getting-started.html

rm lingering reference to Recess in the docs

2014-01-11 17:15:08 -08:00

index.html

no more page.base_url

2013-12-28 23:08:46 -08:00

javascript.html

add .container(-fluid) to remaining navbar examples for consistency/accuracy

2014-01-05 12:55:03 -08:00

LICENSE-DOCS

Rearrange repository contents because muahahahahahaha

2013-12-28 22:47:03 -08:00