Merge branch 'release'
# Conflicts: # dist/echarts-en.common.js # dist/echarts-en.common.min.js # dist/echarts-en.js # dist/echarts-en.js.map # dist/echarts-en.min.js # dist/echarts-en.simple.js # dist/echarts-en.simple.min.js # dist/echarts.common.js # dist/echarts.common.min.js # dist/echarts.js # dist/echarts.js.map # dist/echarts.min.js # dist/echarts.simple.js # dist/echarts.simple.min.js # package.json # src/chart/sankey/sankeyLayout.js
Showing
此差异已折叠。
此差异已折叠。
{ | ||
"name": "echarts", | ||
"version": "4.2.1-rc.2", | ||
"version": "4.2.1", | ||
"description": "A powerful charting and visualization library for browser", | ||
"license": "Apache-2.0", | ||
"keywords": [ | ||
... | ... | @@ -20,7 +20,7 @@ |
"zrender": "4.0.7" | ||
}, | ||
"devDependencies": { | ||
"@babel/core": "^7.3.4", | ||
"@babel/core": "7.3.4", | ||
"@babel/helper-module-transforms": "7.0.0-beta.31", | ||
"@babel/helper-simple-access": "7.0.0-beta.31", | ||
"@babel/template": "7.0.0-beta.31", | ||
... | ... |
想要评论请 注册 或 登录