]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
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)
commit41c043dd239a5e63009ce13c705e589e64d5b29f
treecd6df255f2f2e7c0a3dce9496852838d84802ea3
parent6de81a3580b03db432b9e05dfc860ebcdcaa5179
parent47f770c3ef78b5e8deaae3c79bf55be187f338bd
Merge branch 'master' of https://github.com/nnnick/Chart.js

Conflicts:
docs/01-Scales.md
docs/01-Scales.md
test/core.helpers.tests.js