]> 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: d381117 b197fda)
Merge remote-tracking branch 'chartjs-origin/master'
authorunknown <slinhart@knights.ucf.edu>
Mon, 4 Jul 2016 00:35:21 +0000 (18:35 -0600)
committerunknown <slinhart@knights.ucf.edu>
Mon, 4 Jul 2016 00:35:21 +0000 (18:35 -0600)
Conflicts:
src/core/core.legend.js

1  2 
docs/01-Chart-Configuration.md patch | diff1 | diff2 | blob | history
src/core/core.legend.js patch | diff1 | diff2 | blob | history

diff --cc docs/01-Chart-Configuration.md
Simple merge
diff --cc src/core/core.legend.js
Simple merge
Mirror of https://github.com/chartjs/Chart.js.git