]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
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)
commitf3926198d95a1e0ca0e89f8ac69a3e986e883ff3
tree1648654070fdb1567aba3f1631e8e72e7c4b32af
parent9a0553a1b555fa708bc181cd82441bd4c50ee850
parent79f38b49d802ad2e0573a19a3c6617da85bac479
Merge pull request #2157 from nnnick/fix/2156

Fix scale merge when the xAxes object is specified but the type is not