Mark Otto b253cb2c1e Merge branch 'master' into docs_derp ...

Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html

2013-12-31 13:53:33 -08:00

..

_data

Rearrange repository contents because muahahahahahaha

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

_includes

Merge branch 'master' into docs_derp

2013-12-31 13:53:33 -08:00

_layouts

Merge branch 'master' into docs_derp

2013-12-31 13:53:33 -08:00

assets

Merge branch 'master' into docs_derp

2013-12-31 13:53:33 -08:00

dist

Streamline copy process by not bringing over full files into docs/dist/, only take minified ones

2013-12-28 23:05:02 -08:00

examples

Rearrange repository contents because muahahahahahaha

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

about.html

Merge branch 'master' into docs_derp

2013-12-31 13:53:33 -08:00

components.html

Merge branch 'master' into docs_derp

2013-12-31 13:53:33 -08:00

css.html

Merge branch 'master' into docs_derp

2013-12-31 13:53:33 -08:00

customize.html

Merge branch 'master' into docs_dir

2013-12-31 10:38:31 -08:00

getting-started.html

Merge branch 'master' into docs_derp

2013-12-31 13:53:33 -08:00

index.html

Merge branch 'master' into docs_derp

2013-12-31 13:53:33 -08:00

javascript.html

Merge branch 'master' into docs_dir

2013-12-31 10:38:31 -08:00

LICENSE-DOCS

Rearrange repository contents because muahahahahahaha

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