]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems
authorEvert Timberg <evert.timberg@gmail.com>
Fri, 18 Sep 2015 22:38:47 +0000 (18:38 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Fri, 18 Sep 2015 22:38:47 +0000 (18:38 -0400)
commitbcbd9a85e6398137ea646f997a5f1499043cc5a4
tree60124f1bf7c86fb44139e2554070752056c77cfc
parente6220f474b8f6755592ea72860cb953db6197fa5
parent723c85320ff2d3045e33a518eca5ba3ae45e7b72
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems

Conflicts:
gulpfile.js
gulpfile.js
package.json
src/core/core.controller.js
src/core/core.helpers.js