]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge branch 'v2.0-dev' into fix/1725 1755/head
authorEvert Timberg <evert.timberg@gmail.com>
Sat, 12 Dec 2015 14:01:59 +0000 (09:01 -0500)
committerEvert Timberg <evert.timberg@gmail.com>
Sat, 12 Dec 2015 14:01:59 +0000 (09:01 -0500)
commit95332e39f517dbb312dd2518c3f87460a0be88a7
treedceea44cd5c06c4f7065e92c6a41f84aaf07d24f
parentd689e0fc47fa3b7e475ec328be6a9c9e50e4d79d
parentae3025a2e178049d3e4d1ef76323708f8717398f
Merge branch 'v2.0-dev' into fix/1725

Conflicts:
src/core/core.controller.js
src/core/core.controller.js