]> 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: 9dbc565 e91e6be)
Merge branch 'v2.0-dev' into v2.0-beta1-docs 1713/head
authorEvert Timberg <evert.timberg@gmail.com>
Sun, 29 Nov 2015 16:32:57 +0000 (11:32 -0500)
committerEvert Timberg <evert.timberg@gmail.com>
Sun, 29 Nov 2015 16:32:57 +0000 (11:32 -0500)
Conflicts:
docs/01-Scales.md

1  2 
docs/01-Scales.md patch | diff1 | diff2 | blob | history
docs/02-Line-Chart.md patch | diff1 | diff2 | blob | history

diff --cc docs/01-Scales.md
Simple merge
diff --cc docs/02-Line-Chart.md
Simple merge
Mirror of https://github.com/chartjs/Chart.js.git