]> 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: 81095e7 a756e0d)
Merge pull request #1525 from etimberg/fix/scale-merge
authorTanner Linsley <tannerlinsley@gmail.com>
Mon, 12 Oct 2015 17:51:21 +0000 (11:51 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Mon, 12 Oct 2015 17:51:21 +0000 (11:51 -0600)
Merge scale settings at the correct time


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