bootstrap/docs
Mark Otto a56de2b84f Merge branch 'glyphicons_font' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less
2012-11-03 16:15:54 -07:00
..
assets Merge branch 'glyphicons_font' into exploratory 2012-11-03 16:15:54 -07:00
build Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
examples add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
templates Merge branch 'glyphicons_font' into exploratory 2012-11-03 16:15:54 -07:00
base-css.html Merge branch 'glyphicons_font' into exploratory 2012-11-03 16:15:54 -07:00
components.html Navs refactor, restoring .nav-list 2012-11-03 16:14:44 -07:00
customize.html Merge branch '2.2.2-wip' into exploratory 2012-11-03 13:44:01 -07:00
extend.html Merge branch '2.2.2-wip' into exploratory 2012-11-02 09:36:51 -07:00
getting-started.html Merge branch '2.2.2-wip' into exploratory 2012-11-02 09:36:51 -07:00
index.html Merge branch '2.2.2-wip' into exploratory 2012-11-02 09:36:51 -07:00
javascript.html Merge branch '2.2.2-wip' into exploratory 2012-11-03 13:44:01 -07:00
scaffolding.html Merge branch '2.2.2-wip' into exploratory 2012-11-03 13:44:01 -07:00