]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/logarithmic_scale
authorEvert Timberg <evert.timberg@gmail.com>
Mon, 14 Sep 2015 22:59:52 +0000 (18:59 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Mon, 14 Sep 2015 22:59:52 +0000 (18:59 -0400)

Trivial merge