From: Mark Otto Date: Fri, 11 Jul 2014 07:38:28 +0000 (-0700) Subject: Merge branch 'master' into derp X-Git-Tag: v4.0.0-alpha~732 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cabb86d126584f48651431f431070dcf6bd9d76f;p=thirdparty%2Fbootstrap.git Merge branch 'master' into derp Conflicts: dist/css/bootstrap-theme.css.map dist/css/bootstrap.css.map docs/_includes/components/progress-bars.html docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css.map --- cabb86d126584f48651431f431070dcf6bd9d76f diff --cc docs/_includes/js/dropdowns.html index 78d8b2c8a2,7a442fa039..aa5b9df224 --- a/docs/_includes/js/dropdowns.html +++ b/docs/_includes/js/dropdowns.html @@@ -114,10 -114,9 +114,9 @@@ {% highlight html %}