]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge branch 'master' into fix/2344 2625/head
authorEvert Timberg <evert.timberg+github@gmail.com>
Wed, 25 May 2016 22:43:35 +0000 (18:43 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Wed, 25 May 2016 22:43:35 +0000 (18:43 -0400)

Trivial merge