]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge branch 'v2.0-dev' into v2.0-dev-refactor
authorTanner Linsley <tannerlinsley@gmail.com>
Thu, 24 Sep 2015 20:34:26 +0000 (14:34 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Thu, 24 Sep 2015 20:34:26 +0000 (14:34 -0600)
commitb22f569e4da4470cb6863dfc5b76e29628ac6061
tree7ce4f44be3e989d00b14ca340ecbd33a149db05f
parent1f0ee92992b996f7338f04cbbdb68ce9a8436cde
parentd1067f956cadfe0cb3c474882abe132f629c4c1b
Merge branch 'v2.0-dev' into v2.0-dev-refactor

Conflicts:
samples/line-scale-override.html
samples/line-x-axis-filter.html
samples/line.html
src/controllers/controller.bar.js
src/core/core.controller.js
src/scales/scale.category.js
13 files changed:
Chart.js
Chart.min.js
samples/bar.html
samples/combo-time-scale.html
samples/line-time-scale.html
samples/line-x-axis-filter.html
samples/line.html
src/controllers/controller.bar.js
src/controllers/controller.line.js
src/controllers/controller.polarArea.js
src/core/core.controller.js
src/core/core.helpers.js
src/core/core.scale.js