]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge branch 'master' into file-size-reduction 2491/head
authorEvert Timberg <evert.timberg+github@gmail.com>
Thu, 12 May 2016 22:57:22 +0000 (18:57 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Thu, 12 May 2016 22:57:22 +0000 (18:57 -0400)
commit14021069c39814f0dba119acc1ca03f36700ff22
tree670946034eb746e7e6f247f218feb55eeaa36a23
parentee383ef4a68abc23353108204bf89409f4b8208d
parent691a7c6a4bef0c6e0b8d1c82bafd4e2807239fac
Merge branch 'master' into file-size-reduction

Conflicts:
src/controllers/controller.doughnut.js
src/controllers/controller.polarArea.js
src/core/core.datasetController.js