]> 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: dae1e42 e87fd9e)
Merge remote-tracking branch 'nnnick/v2.0-dev' into v2.0-dev
authorwuchangming <wuchangmingnice@163.com>
Fri, 27 Nov 2015 00:50:55 +0000 (08:50 +0800)
committerwuchangming <wuchangmingnice@163.com>
Fri, 27 Nov 2015 00:50:55 +0000 (08:50 +0800)

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