]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge pull request #4236 from chartjs/master
authorSimon Brunel <simonbrunel@users.noreply.github.com>
Thu, 25 May 2017 13:34:04 +0000 (15:34 +0200)
committerGitHub <noreply@github.com>
Thu, 25 May 2017 13:34:04 +0000 (15:34 +0200)
Version 2.6.0


Trivial merge