]> 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: 5924143 f85ffbc)
Merge pull request #1647 from nnnick/fix/1324
authorTanner Linsley <tannerlinsley@gmail.com>
Mon, 16 Nov 2015 23:09:53 +0000 (16:09 -0700)
committerTanner Linsley <tannerlinsley@gmail.com>
Mon, 16 Nov 2015 23:09:53 +0000 (16:09 -0700)
Fall back to line settings for points if necessary

1  2 
src/controllers/controller.line.js patch | diff1 | diff2 | blob | history
test/controller.line.tests.js patch | diff1 | diff2 | blob | history

diff --cc src/controllers/controller.line.js
Simple merge
diff --cc test/controller.line.tests.js
Simple merge
Mirror of https://github.com/chartjs/Chart.js.git