]> 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: d051dfe a5550ce)
Merge remote-tracking branch 'upstream/master' 867/head
authorBen Dixon <bendxn@gmail.com>
Tue, 27 Jan 2015 00:49:17 +0000 (18:49 -0600)
committerBen Dixon <bendxn@gmail.com>
Tue, 27 Jan 2015 00:49:17 +0000 (18:49 -0600)

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