Merge branch 'master' into 7.0

# Conflicts: # .travis.yml # CHANGELOG.md # lerna.json # packages/babel-cli/package.json
2017-01-21 08:52:14 -05:00
parent e9d87ed55c d76092b2dd
commit 661102c7ea
7 changed files with 38 additions and 30 deletions
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
      "transform-flow-strip-types"
    ],
    "env": {
-      "test": {
+      "cov": {
        "auxiliaryCommentBefore": "istanbul ignore next",
        "plugins": [
          "istanbul"