]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
projects / thirdparty / Chart.js.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d9c335c e856dda)
Merge branch 'multiline_labels' of https://github.com/Tarqwyn/Chart.js into Tarqwyn...
authorEvert Timberg <evert.timberg+github@gmail.com>
Sun, 5 Jun 2016 00:48:26 +0000 (20:48 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Sun, 5 Jun 2016 00:48:26 +0000 (20:48 -0400)
commit76d284c4aeefe81216b2e00f4e356f69f6d308b0
treea231c8b299ab107dc4ed0f623e8052f3807ec662tree
parentd9c335c860483faac7dbbcd60aa84e74cfbd3e3bcommit | diff
parente856dda04f7a594f17032302f2ca36669b5ec427commit | diff
Merge branch 'multiline_labels' of https://github.com/Tarqwyn/Chart.js into Tarqwyn-multiline_labels

Conflicts:
src/core/core.scale.js
src/core/core.scale.js diff1 | diff2 | blob | history
Mirror of https://github.com/chartjs/Chart.js.git