Mark Otto 750a9d7d80 fix bad merge

2016-10-09 15:08:34 -07:00

..

_data

Merge branch 'v4-dev' into v4-utils

2016-10-09 14:36:43 -07:00

_includes

Merge branch 'v4-dev' into v4-utils

2016-10-09 14:36:43 -07:00

_layouts

More grid updates

2016-02-06 11:31:46 -08:00

_plugins

docs/_plugins/bugify.rb: Add support for MS Edge UserVoice ideas (#20176)

2016-06-25 21:32:23 -07:00

about

Fix broken/redirected links, moving to HTTPS where possible. (#20557)

2016-10-03 09:55:59 -07:00

assets

grunt

2016-10-09 15:02:49 -07:00

components

fix bad merge

2016-10-09 15:08:34 -07:00

content

Merge branch 'v4-dev' into v4-utils

2016-10-09 14:36:43 -07:00

dist

Merge branch 'v4-dev' into v4-navbars

2016-10-09 15:04:32 -07:00

examples

Merge branch 'v4-dev' into v4-utils

2016-10-09 14:36:43 -07:00

extend

Mark icon-fonts.md docs as not-yet-written (#20850)

2016-10-06 23:59:19 -07:00

getting-started

Fix broken/redirected links, moving to HTTPS where possible. (#20557)

2016-10-03 09:55:59 -07:00

layout

Merge pull request #20864 from twbs/fix-20688

2016-10-09 14:57:31 -07:00

utilities

Merge branch 'v4-dev' into v4-utils

2016-10-09 14:36:43 -07:00

.htmlhintrc

Add HTMLHint to the build; fixes #20297 (#20301)

2016-07-14 16:22:56 -07:00

apple-touch-icon.png

…

browser-bugs.md

Fix broken/redirected links, moving to HTTPS where possible. (#20557)

2016-10-03 09:55:59 -07:00

CNAME

…

favicon.ico

…

index.html

Fix broken/redirected links, moving to HTTPS where possible. (#20557)

2016-10-03 09:55:59 -07:00

LICENSE

…

migration.md

Merge branch 'v4-dev' into v4-utils

2016-10-09 14:36:43 -07:00

robots.txt

…

search.json

…