Merge branch 'master' into docs_derp

Browse Source

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

...

This commit is contained in:

Mark Otto

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

parent 9e1153d049 8812856de1

commit b253cb2c1e

113 changed files with 406 additions and 128 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/css.html

+3514

File diff suppressed because it is too large Load Diff