]> 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>
Tue, 2 Jun 2015 22:55:41 +0000 (18:55 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Tue, 2 Jun 2015 22:55:41 +0000 (18:55 -0400)
1  2 
src/Chart.Core.js

Simple merge