]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into v2.0-dev
authorEvert Timberg <evert.timberg@gmail.com>
Sun, 5 Jul 2015 18:56:54 +0000 (14:56 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Sun, 5 Jul 2015 18:56:54 +0000 (14:56 -0400)

Trivial merge