]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart...
authorEvert Timberg <evert.timberg@gmail.com>
Thu, 4 Jun 2015 00:49:37 +0000 (20:49 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Thu, 4 Jun 2015 00:49:37 +0000 (20:49 -0400)

Trivial merge