]> 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: 64f37a3 eea51e8)
Merge branch 'master' into release 3536/head
authorSimon Brunel <simonbrunel@users.noreply.github.com>
Thu, 22 Sep 2016 18:56:14 +0000 (20:56 +0200)
committerSimon Brunel <simonbrunel@users.noreply.github.com>
Thu, 22 Sep 2016 18:56:14 +0000 (20:56 +0200)

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