Merge remote-tracking branch 'babel/master' into fix-es2015-assertion-type

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Nicolas Gilbert 2015-11-10 06:40:43 +13:00
commit 68e1e3c90c

View File

@ -12,7 +12,7 @@
"chalk": "1.1.1",
"derequire": "^2.0.2",
"es5-shim": "^4.1.7",
"eslint": "^1.1.0",
"eslint": "1.8.0",
"fs-readdir-recursive": "^0.1.2",
"gulp": "^3.9.0",
"gulp-babel": "^5.3.0",