Skip to content

Commit

Permalink
Merge pull request apache#1 from ecomfe/master
Browse files Browse the repository at this point in the history
merge since my clone
  • Loading branch information
Ovilia committed Jul 9, 2015
2 parents 6ece680 + 817eed0 commit 7ba5baf
Show file tree
Hide file tree
Showing 90 changed files with 1,241 additions and 706 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "echarts",
"version": "2.2.3",
"version": "2.2.5",
"homepage": "http://echarts.baidu.com",
"repository": "git://github.com/ecomfe/echarts",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion build/dist/chart/bar.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/dist/chart/chord.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/dist/chart/eventRiver.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/dist/chart/force.js

Large diffs are not rendered by default.

Loading

0 comments on commit 7ba5baf

Please sign in to comment.