]> 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: 6185f15 31643ee)
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0-scale-refactor
authorEvert Timberg <evert.timberg@gmail.com>
Sat, 13 Jun 2015 12:35:34 +0000 (08:35 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Sat, 13 Jun 2015 12:35:34 +0000 (08:35 -0400)
1  2 
src/scales/scale.category.js patch | diff1 | diff2 | blob | history

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