Mark Otto f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip ... Conflicts: docs/assets/css/docs.css docs/base-css.html docs/components.html docs/customize.html docs/getting-started.html docs/javascript.html docs/scaffolding.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/customize.mustache docs/templates/pages/getting-started.mustache docs/templates/pages/javascript.mustache docs/templates/pages/scaffolding.mustache		2012-07-23 23:01:38 -07:00
..
pages	Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip	2012-07-23 23:01:38 -07:00
layout.mustache	some progress on affix plugin	2012-07-22 18:28:39 -07:00