]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge branch 'v2.0-dev' into v2.0-legend
authorEvert Timberg <evert.timberg@gmail.com>
Fri, 4 Dec 2015 02:21:10 +0000 (21:21 -0500)
committerEvert Timberg <evert.timberg@gmail.com>
Fri, 4 Dec 2015 02:21:10 +0000 (21:21 -0500)
commitdcc06eb3bb221620b268617f80498b07e562aeae
tree1f091b03b68c03d714ca45095961cedd4e87110a
parent37abe74d4302c646d4ee34ad08791d91b7958b8e
parent62bc4e42ec6dd33866b245f01614e9ab96c4a2dd
Merge branch 'v2.0-dev' into v2.0-legend

Conflicts:
src/core/core.scaleService.js
src/core/core.layoutService.js
src/core/core.scale.js