]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge branch 'v2.0-dev' into v2.0-legend 1750/head
authorEvert Timberg <evert.timberg@gmail.com>
Tue, 8 Dec 2015 03:10:38 +0000 (22:10 -0500)
committerEvert Timberg <evert.timberg@gmail.com>
Tue, 8 Dec 2015 03:10:38 +0000 (22:10 -0500)
commit819f8657239dbdb1af0479ff6c1d99db7dbce5ef
treee8952f14b693749ad54e7671d1d727ecb6860683
parent4f8f182d216b4eb4fe4bfb0bfadd884d9771670d
parent3b750e7f270f1332dc4695a766bae83fb2871887
Merge branch 'v2.0-dev' into v2.0-legend

Conflicts:
src/controllers/controller.doughnut.js
docs/00-Getting-Started.md
src/controllers/controller.doughnut.js
src/core/core.controller.js
src/core/core.scale.js
src/elements/element.line.js
test/controller.doughnut.tests.js