Mark Otto ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise ...

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less

2012-09-25 22:00:41 -07:00

..

css

Merge branch '2.1.2-wip' into box-sizing-exercise

2012-09-25 22:00:41 -07:00

ico

new fav and touch icons to match new masthead

2012-07-30 10:33:48 -07:00

img

way cooler carousel example, along with updated screenshots for examples

2012-09-14 15:55:46 -07:00

js

change transition.js, rebuild… travis maybe will be happy?

2012-09-20 16:50:36 -07:00