]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge branch 'iso_weekday' of https://github.com/tomduncalf/Chart.js into tomduncalf...
authorEvert Timberg <evert.timberg+github@gmail.com>
Thu, 12 May 2016 22:24:14 +0000 (18:24 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Thu, 12 May 2016 22:24:14 +0000 (18:24 -0400)
commit8c209405e9edf33264b8eaea9cb1f48280fae2a5
tree93a43ef9b5a66ef23dd95e66ee02d32d347e3fa8
parent41c043dd239a5e63009ce13c705e589e64d5b29f
parent8b3d079a5008e80097829a9c52e24139de689883
Merge branch 'iso_weekday' of https://github.com/tomduncalf/Chart.js into tomduncalf-iso_weekday

Conflicts:
docs/01-Scales.md
docs/01-Scales.md
test/scale.time.tests.js