From: Mark Otto <markdotto@gmail.com>
Date: Thu, 1 Jun 2017 03:46:29 +0000 (-0700)
Subject: Merge branch 'v4-dev' into v4-docs-streamlined
X-Git-Tag: v4.0.0-beta~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F22716%2Fhead;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into v4-docs-streamlined
---

332d882cdbb541f1f6d5b781b1454f84bb0c8ad2
diff --cc package.json
index e44d301865,dffc58f836..08fe1b40c6
--- a/package.json
+++ b/package.json
@@@ -77,9 -78,10 +77,9 @@@
      "babel-cli": "^6.24.1",
      "babel-eslint": "^7.2.3",
      "babel-plugin-transform-es2015-modules-strip": "^0.1.1",
-     "babel-preset-es2015": "^7.0.0-alpha.7",
+     "babel-preset-es2015": "^6.24.1",
      "clean-css-cli": "^4.1.3",
      "eslint": "^3.19.0",
 -    "htmlhint": "^0.9.13",
      "htmllint-cli": "^0.0.6",
      "node-sass": "^4.5.3",
      "nodemon": "^1.11.0",