]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge branch 'master' of https://github.com/nnnick/Chart.js
authorEvert Timberg <evert.timberg+github@gmail.com>
Thu, 12 May 2016 22:22:55 +0000 (18:22 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Thu, 12 May 2016 22:22:55 +0000 (18:22 -0400)
Conflicts:
docs/01-Scales.md

1  2 
docs/01-Scales.md
test/core.helpers.tests.js

Simple merge
Simple merge