]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
projects / thirdparty / Chart.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 529d582 14e7275)
Merge branch 'master' into fix/sparse-datasets
authorNick Downie <nick@nickdownie.com>
Sun, 3 Aug 2014 15:05:34 +0000 (16:05 +0100)
committerNick Downie <nick@nickdownie.com>
Sun, 3 Aug 2014 15:05:34 +0000 (16:05 +0100)
Conflicts:
Chart.min.js

1  2 
Chart.js patch | diff1 | diff2 | blob | history
src/Chart.Core.js patch | diff1 | diff2 | blob | history

diff --cc Chart.js
Simple merge
diff --cc src/Chart.Core.js
Simple merge
Mirror of https://github.com/chartjs/Chart.js.git