From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Thu, 25 May 2017 13:34:04 +0000 (+0200)
Subject: Merge pull request #4236 from chartjs/master
X-Git-Tag: v2.6.0~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2798861cae202006e640bc6801b063b454af9138;p=thirdparty%2FChart.js.git

Merge pull request #4236 from chartjs/master

Version 2.6.0
---

2798861cae202006e640bc6801b063b454af9138