From: Jacob Thornton Date: Thu, 8 Aug 2013 06:10:11 +0000 (-0700) Subject: Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip X-Git-Tag: v3.0.0-rc.2~94 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89b69ed77035eeb9c0034534d75fdb2062f10d47;p=thirdparty%2Fbootstrap.git Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Conflicts: _layouts/customize.html --- 89b69ed77035eeb9c0034534d75fdb2062f10d47 diff --cc customize.html index b8936ee215,866ce83f5a..430a01d2e4 --- a/customize.html +++ b/customize.html @@@ -1451,135 -1451,3 +1451,135 @@@ base_url: "../ + + + + + + + +