0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Bootstrap/docs/templates/pages
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
..
base-css.mustache Merge branch 'glyphicons_font' into exploratory 2012-11-03 16:15:54 -07:00
components.mustache Navs refactor, restoring .nav-list 2012-11-03 16:14:44 -07:00
customize.mustache fixes #5756: duplicate media CSS in compiled builds 2012-11-02 09:47:42 -07:00
extend.mustache Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
getting-started.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-02 09:36:51 -07:00
index.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-02 09:36:51 -07:00
javascript.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-03 13:44:01 -07:00
scaffolding.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-03 13:44:01 -07:00