Merge branch 'master' into 7.0

# Conflicts:
#	.travis.yml
#	CHANGELOG.md
#	lerna.json
#	packages/babel-cli/package.json
This commit is contained in:
Henry Zhu
2017-01-21 08:52:14 -05:00
7 changed files with 38 additions and 30 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "babel-cli",
"version": "6.22.1",
"version": "6.22.2",
"description": "Babel command line.",
"author": "Sebastian McKenzie <sebmck@gmail.com>",
"homepage": "https://babeljs.io/",