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

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

2014-06-25 16:57:22 -07:00

..

_data

new homepage expo features

2014-06-22 18:04:19 -07:00

_includes

grid class inconsistency 2

2014-06-23 23:36:18 +02:00

_jade

Fix #13138: use underscore prefix to ignore directories

2014-03-24 21:47:59 +01:00

_layouts

fix part of #13111: hide the docs nav on small and below devices

2014-06-18 19:18:02 -07:00

assets

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

2014-06-25 16:57:22 -07:00

dist

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

2014-06-25 16:57:22 -07:00

examples

formatting

2014-06-19 18:15:42 -07:00

about.html

add svg logos to brand guidelines

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

apple-touch-icon-precomposed.png

Losslessly compress apple-touch-icon-precomposed.png.

2014-06-09 01:15:08 +03:00

browser-bugs.html

tweak #13453 Firefox bug summary

2014-06-11 11:48:43 -07:00

components.html

Break up docs into includes

2014-03-16 19:03:53 -07:00

css.html

move rtl to getting started, per @cvrebert's feedback

2014-05-07 15:30:27 -07:00

customize.html

show proper error message when viewing Customizer in IE8

2014-05-21 21:07:16 -07:00

favicon.ico

Fix favicon.ico after d763b0fe5b5d83025b94212638b1bd5500c43c71.

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

getting-started.html

nuke the rtl docs

2014-05-12 19:55:58 -07:00

index.html

new homepage expo features

2014-06-22 18:04:19 -07:00

javascript.html

Separate JS includes for alerts and popovers

2014-03-17 15:58:03 +01:00

LICENSE

Rename docs/LICENSE-DOCS to docs/LICENSE

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

migration.html

FIX: #13355. Added .navbar-nav to migration change list.

2014-04-17 21:35:55 -05:00

robots.txt

Add sitemap.xml and robots.txt files.

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

sitemap.xml

Add missing blank line

2014-03-15 22:40:51 +01:00