]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge remote-tracking branch 'chartjs-origin/master'
authorunknown <slinhart@knights.ucf.edu>
Wed, 6 Jul 2016 17:21:57 +0000 (11:21 -0600)
committerunknown <slinhart@knights.ucf.edu>
Wed, 6 Jul 2016 17:21:57 +0000 (11:21 -0600)

Trivial merge