From: Nicolas Coden <nicolas@ncoden.fr>
Date: Mon, 26 Mar 2018 17:46:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'zurb/develop' into chore/sort-sass-components-by-specif... 
X-Git-Tag: v6.6.0~3^2~267^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10856%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge remote-tracking branch 'zurb/develop' into chore/sort-sass-components-by-specificity
---

1ef073872c0a5d9c9f125481e091d9d8e597104a
diff --cc scss/foundation.scss
index e156b8d0f,0b3b837f1..947debaab
--- a/scss/foundation.scss
+++ b/scss/foundation.scss
@@@ -5,8 -5,8 +5,8 @@@
   * Licensed under MIT Open Source
   */
  
 -// Dependencies
 +// --- Dependencies ---
- @import '../_vendor/normalize-scss/sass/normalize';
+ @import 'vendor/normalize';
  @import '../_vendor/sassy-lists/stylesheets/helpers/missing-dependencies';
  @import '../_vendor/sassy-lists/stylesheets/helpers/true';
  @import '../_vendor/sassy-lists/stylesheets/functions/contain';