0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

2 Commits

Author SHA1 Message Date
Mark Otto
724240fe4f Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/_includes/js/overview.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/carousel.less
2014-08-04 15:09:23 -07:00
Mark Otto
fecbaca907 grunt some more things, rebuild customizer nav 2014-07-12 18:11:07 -07:00