]> git.ipfire.org Git - thirdparty/Chart.js.git/commit
Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev
authorRobert Becker <robert@rbecker.eu>
Thu, 4 Feb 2016 09:38:35 +0000 (10:38 +0100)
committerRobert Becker <robert@rbecker.eu>
Thu, 4 Feb 2016 09:38:35 +0000 (10:38 +0100)
commitdf218ead824497edfd75220f5b8bc67c03ad1fd6
treebc47e7a941d5e79e8ece40978c1fa8349df1bd15
parentba6afa7257bfd3a1497acc2f549821caf4648fdf
parente7df265c7a35d073302bc20c776dce8a127fc6de
Merge branch 'v2.0-dev' of github.com:roben/Chart.js into v2.0-dev

# Conflicts:
# src/core/core.helpers.js