From: Evert Timberg Date: Sat, 15 Aug 2015 14:57:13 +0000 (-0400) Subject: Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into fix/template-caching X-Git-Tag: 2.0.0-alpha4~45^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1380%2Fhead;p=thirdparty%2FChart.js.git Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into fix/template-caching --- 3dd2ee796861b403c9f23236f300afb17d425c25