]> 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: 4755215 c1d7725)
Merge branch 'master' into feature/pan-support
authorEvert Timberg <evert.timberg+github@gmail.com>
Sun, 24 Apr 2016 00:06:18 +0000 (20:06 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Sun, 24 Apr 2016 00:06:18 +0000 (20:06 -0400)
Conflicts:
src/core/core.controller.js


Trivial merge
Mirror of https://github.com/chartjs/Chart.js.git