]> 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: 41c043d 8b3d079)
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)
Conflicts:
docs/01-Scales.md

1  2 
docs/01-Scales.md patch | diff1 | diff2 | blob | history
test/scale.time.tests.js patch | diff1 | diff2 | blob | history

diff --cc docs/01-Scales.md
Simple merge
diff --cc test/scale.time.tests.js
Simple merge
Mirror of https://github.com/chartjs/Chart.js.git