]> 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>
Fri, 19 Jun 2015 18:36:27 +0000 (12:36 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Fri, 19 Jun 2015 18:36:27 +0000 (12:36 -0600)

Trivial merge