]> 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: 6bc917c 6667832)
Merge branch 'tooltip-improvements-and-tests' of https://github.com/nnnick/Chart... 2661/head
authorEvert Timberg <evert.timberg+github@gmail.com>
Sun, 29 May 2016 01:17:30 +0000 (21:17 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Sun, 29 May 2016 01:17:30 +0000 (21:17 -0400)
Conflicts:
test/core.tooltip.tests.js


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