Commit Graph

5 Commits

Author SHA1 Message Date
Mark Otto ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Quy Ton 82ed81fddf Fix typo 2014-01-04 21:35:06 -08:00
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
Mark Otto 70b8b330f0 no more page.base_url 2013-12-28 23:08:46 -08:00
Mark Otto a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00