Merge branch 'master' into merge-master

# Conflicts:
#	lerna.json
#	packages/babel-cli/package.json
#	packages/babel-core/package.json
#	packages/babel-generator/package.json
#	packages/babel-helper-builder-react-jsx/package.json
#	packages/babel-helper-function-name/package.json
#	packages/babel-helper-optimise-call-expression/package.json
#	packages/babel-helper-replace-supers/package.json
#	packages/babel-helper-transform-fixture-test-runner/package.json
#	packages/babel-helpers/package.json
#	packages/babel-plugin-transform-class-properties/package.json
#	packages/babel-plugin-transform-es2015-block-scoping/package.json
#	packages/babel-plugin-transform-es2015-classes/package.json
#	packages/babel-plugin-transform-es2015-modules-commonjs/package.json
#	packages/babel-plugin-transform-es2015-modules-systemjs/package.json
#	packages/babel-plugin-transform-es2015-modules-umd/package.json
#	packages/babel-plugin-transform-es2015-parameters/package.json
#	packages/babel-plugin-transform-react-jsx/package.json
#	packages/babel-register/package.json
#	packages/babel-template/package.json
#	packages/babel-traverse/package.json
#	packages/babel/package.json
This commit is contained in:
Daniel Tschinder
2017-02-14 12:46:11 +01:00
87 changed files with 830 additions and 256 deletions

View File

@@ -1,16 +1,16 @@
{
"name": "babel-plugin-transform-es2015-parameters",
"version": "6.22.0",
"version": "6.23.0",
"description": "Compile ES2015 default and rest parameters to ES5",
"repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-es2015-parameters",
"license": "MIT",
"main": "lib/index.js",
"dependencies": {
"babel-traverse": "^6.22.0",
"babel-traverse": "^6.23.0",
"babel-helper-call-delegate": "^6.22.0",
"babel-helper-get-function-arity": "^6.22.0",
"babel-template": "^6.22.0",
"babel-types": "^6.22.0"
"babel-template": "^6.23.0",
"babel-types": "^6.23.0"
},
"keywords": [
"babel-plugin"