]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
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)
commite5ee242dc60fae2b6a52f903e71c3b3a89e44862
treec301a6b63d7e3edd721e94456887ea68e92ffe4c
parent9dbc5650ed437350eeb97eb7264f32fe165f1772
parente91e6be851705eb97bf18bdf495a4f62705b535b
Merge branch 'v2.0-dev' into v2.0-beta1-docs

Conflicts:
docs/01-Scales.md
docs/01-Scales.md
docs/02-Line-Chart.md