From: Nicolas Coden <nicolas@ncoden.fr>
Date: Thu, 5 Apr 2018 21:27:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'zurb/develop' into chore/update-dependencies
X-Git-Tag: v6.6.0~3^2~241^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b53764be031d3b7a514ac66d53eb3b81ac92cfa;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge remote-tracking branch 'zurb/develop' into chore/update-dependencies
---

9b53764be031d3b7a514ac66d53eb3b81ac92cfa
diff --cc package.json
index 29843f682,382933e19..36ae4ecb8
--- a/package.json
+++ b/package.json
@@@ -33,17 -33,26 +33,18 @@@
    "license": "MIT",
    "devDependencies": {
      "array-uniq": "^1.0.2",
 -    "autoprefixer": "^6.7.7",
 +    "autoprefixer": "^8.2.0",
      "babel-core": "^6.26.0",
      "babel-loader": "^7.1.2",
 -    "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
 -    "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
 -    "babel-plugin-transform-es2015-block-scoping": "^6.26.0",
 -    "babel-plugin-transform-es2015-classes": "^6.24.1",
 -    "babel-plugin-transform-es2015-destructuring": "^6.23.0",
 -    "babel-plugin-transform-es2015-parameters": "^6.24.1",
 -    "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
 -    "babel-plugin-transform-es2015-spread": "^6.22.0",
 -    "babel-plugin-transform-es2015-template-literals": "^6.22.0",
 +    "babel-preset-env": "^1.6.1",
      "browser-sync": "^2.18.12",
+     "browserstack-runner": "^0.7.0",
      "chai-jquery": "^2.0.0",
 -    "chalk": "^1.1.1",
 -    "clipboard": "^1.7.1",
 +    "chalk": "^2.3.2",
 +    "clipboard": "^2.0.0",
      "corejs-typeahead": "^1.1.1",
      "dateformat": "^3.0.0",
 -    "doiuse": "^2.6.0",
 +    "doiuse": "^4.1.0",
      "foundation-docs": "github:zurb/foundation-docs#e95141823f1248fd62a83ed5999cdd979cacd9e5",
      "gaze": "^1.1.2",
      "gulp": "^3.8.10",