]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
authorTanner Linsley <tannerlinsley@gmail.com>
Thu, 11 Jun 2015 07:06:07 +0000 (01:06 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Thu, 11 Jun 2015 07:06:07 +0000 (01:06 -0600)
1  2 
src/Chart.Line.js
src/Chart.PolarArea.js
src/Chart.Radar.js
src/Chart.Scatter.js

Simple merge
Simple merge
Simple merge
Simple merge