From: Mark Otto <markdotto@gmail.com>
Date: Sun, 7 Feb 2016 04:33:26 +0000 (-0800)
Subject: Merge branch 'v4-dev' into v4-split-buttons
X-Git-Tag: v4.0.0-alpha.3~84^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7d0e186bdfb52856a455c438538582fe95324e6;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into v4-split-buttons
---

d7d0e186bdfb52856a455c438538582fe95324e6
diff --cc scss/bootstrap.scss
index febbc4ea4a,ef30c6b639..03aef0c6a4
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@@ -5,7 -5,7 +5,8 @@@
   */
  
  // Core variables and mixins
 +@import "functions";
+ @import "custom";
  @import "variables";
  @import "mixins";