]> 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: 9a0553a 79f38b4)
Merge pull request #2157 from nnnick/fix/2156
authorEvert Timberg <evert.timberg+github@gmail.com>
Sun, 20 Mar 2016 15:15:41 +0000 (11:15 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Sun, 20 Mar 2016 15:15:41 +0000 (11:15 -0400)
Fix scale merge when the xAxes object is specified but the type is not


Trivial merge
Mirror of https://github.com/chartjs/Chart.js.git