]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
projects / thirdparty / Chart.js.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a62e0e 8e5d8b8)
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart...
authorEvert Timberg <evert.timberg@gmail.com>
Wed, 3 Jun 2015 22:36:08 +0000 (18:36 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Wed, 3 Jun 2015 22:36:08 +0000 (18:36 -0400)

Trivial merge
Mirror of https://github.com/chartjs/Chart.js.git