0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Bootstrap/docs
Mark Otto 70459c1454 Merge branch 'master' into docs_derp
Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
2014-01-01 12:27:09 -08:00
..
_data Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
_includes Merge branch 'master' into docs_derp 2014-01-01 12:27:09 -08:00
_layouts Merge branch 'master' into docs_derp 2013-12-31 13:53:33 -08:00
assets Merge branch 'master' into docs_derp 2014-01-01 12:27:09 -08:00
dist New Year 2014-01-01 15:37:08 +01:00
examples fix assets links in all examples 2014-01-01 22:29:13 +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 fix homepage images 2013-12-31 13:56:20 -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