]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge branch 'v2.0-dev' into fix-legend-tooltip-stacked-ordering
authorTanner Linsley <tannerlinsley@gmail.com>
Wed, 10 Feb 2016 19:15:40 +0000 (12:15 -0700)
committerTanner Linsley <tannerlinsley@gmail.com>
Wed, 10 Feb 2016 19:15:40 +0000 (12:15 -0700)

Trivial merge