]> 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: 25fd844 1c9e901)
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
authorTanner Linsley <tannerlinsley@gmail.com>
Mon, 22 Jun 2015 19:10:52 +0000 (13:10 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Mon, 22 Jun 2015 19:10:52 +0000 (13:10 -0600)
1  2 
src/core/core.controller.js patch | diff1 | diff2 | blob | history

diff --cc src/core/core.controller.js
Simple merge
Mirror of https://github.com/chartjs/Chart.js.git