root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
bootstrap/docs/_layouts
History
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
..
default.html Merge branch 'master' into docs_derp 2013-12-31 13:53:33 -08:00
home.html Merge branch 'master' into docs_derp 2013-12-31 13:53:33 -08:00