]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into fix/template-caching 1380/head
authorEvert Timberg <evert.timberg@gmail.com>
Sat, 15 Aug 2015 14:57:13 +0000 (10:57 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Sat, 15 Aug 2015 14:57:13 +0000 (10:57 -0400)

Trivial merge