From: Evert Timberg Date: Sat, 13 Jun 2015 12:35:34 +0000 (-0400) Subject: Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0-scale-refactor X-Git-Tag: 2.0.0-alpha2~5^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6815fc451f2512ffe831976dab4a0dd37e5fd890;p=thirdparty%2FChart.js.git Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0-scale-refactor --- 6815fc451f2512ffe831976dab4a0dd37e5fd890